Skip to content

Commit

Permalink
Merge pull request PowerShell#577 from SteveL-MSFT/config-pkg
Browse files Browse the repository at this point in the history
update build script to account for configuration files
  • Loading branch information
SteveL-MSFT authored Oct 23, 2024
2 parents c88c4a0 + e35d416 commit e97747d
Show file tree
Hide file tree
Showing 6 changed files with 58 additions and 4 deletions.
6 changes: 3 additions & 3 deletions build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ $filesForWindowsPackage = @(
'windowspowershell.dsc.resource.json',
'wmi.dsc.resource.json',
'wmi.resource.ps1',
'configurations/windows_baseline.dsc.yaml',
'configurations/windows_inventory.dsc.yaml'
'windows_baseline.dsc.yaml',
'windows_inventory.dsc.yaml'
)

$filesForLinuxPackage = @(
Expand Down Expand Up @@ -211,7 +211,7 @@ if (!$SkipBuild) {
}

# make sure dependencies are built first so clippy runs correctly
$windows_projects = @("pal", "registry", "reboot_pending", "wmi-adapter")
$windows_projects = @("pal", "registry", "reboot_pending", "wmi-adapter", "configurations/windows")
$macOS_projects = @("resources/brew")
$linux_projects = @("resources/apt")

Expand Down
2 changes: 2 additions & 0 deletions configurations/windows/copy_files.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
windows_baseline.dsc.yaml
windows_inventory.dsc.yaml
File renamed without changes.
File renamed without changes.
52 changes: 52 additions & 0 deletions tree-sitter-dscexpression/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
{
"name": "tree-sitter-dscexpression",
"version": "1.0.0",
"description": "Dscexpression grammar for tree-sitter",
"repository": "github:tree-sitter/tree-sitter-dscexpression",
"license": "MIT",
"main": "bindings/node",
"types": "bindings/node",
"keywords": [
"incremental",
"parsing",
"tree-sitter",
"dscexpression"
],
"files": [
"grammar.js",
"binding.gyp",
"prebuilds/**",
"bindings/node/*",
"queries/*",
"src/**",
"*.wasm"
],
"dependencies": {
"node-addon-api": "^8.1.0",
"node-gyp-build": "^4.8.2"
},
"devDependencies": {
"prebuildify": "^6.0.1",
"tree-sitter-cli": "^0.24.3"
},
"peerDependencies": {
"tree-sitter": "^0.21.1"
},
"peerDependenciesMeta": {
"tree-sitter": {
"optional": true
}
},
"scripts": {
"install": "node-gyp-build",
"prestart": "tree-sitter build --wasm",
"start": "tree-sitter playground",
"test": "node --test bindings/node/*_test.js"
},
"tree-sitter": [
{
"scope": "source.dscexpression",
"injection-regex": "^dscexpression$"
}
]
}
2 changes: 1 addition & 1 deletion wmi-adapter/Tests/wmi.tests.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ Describe 'WMI adapter resource tests' {
}

It 'Example config works' -Skip:(!$IsWindows) {
$configPath = Join-Path $PSScriptRoot '..\..\configurations\windows_inventory.dsc.yaml'
$configPath = Join-Path $PSScriptRoot '..\..\configurations\windows\windows_inventory.dsc.yaml'
$r = dsc config get -p $configPath
$LASTEXITCODE | Should -Be 0
$r | Should -Not -BeNullOrEmpty
Expand Down

0 comments on commit e97747d

Please sign in to comment.