Skip to content

Commit c6373d3

Browse files
author
Steve Lee (POWERSHELL HE/HIM) (from Dev Box)
committed
move installing tree-sitter to main script
1 parent 5e31515 commit c6373d3

File tree

6 files changed

+12
-13
lines changed

6 files changed

+12
-13
lines changed

.cargo/config.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ rustflags = ["-Ccontrol-flow-guard", "-Ctarget-feature=+crt-static", "-Clink-arg
1919
[source.crates-io]
2020
replace-with = "POWERSHELL"
2121

22-
[target.aarch64-unknown-linux-gnu]
23-
linker = "aarch64-linux-gnu-gcc"
22+
#[target.aarch64-unknown-linux-gnu]
23+
#linker = "aarch64-linux-gnu-gcc"
2424

25-
[target.aarch64-unknown-linux-musl]
26-
linker = "aarch64-linux-musl-gcc"
25+
#[target.aarch64-unknown-linux-musl]
26+
#linker = "aarch64-linux-musl-gcc"

.pipelines/DSC-Official.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,7 @@ extends:
176176
condition: succeeded()
177177
178178
- job: SignMsixBundle
179+
condition: and(succeeded(), eq(parameters.OfficialBuild, true))
179180
dependsOn: CreateMsixBundle
180181
variables:
181182
ob_outputDirectory: '$(Build.ArtifactStagingDirectory)'

.pipelines/DSC-Windows.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ steps:
3939
env:
4040
ob_restore_phase: true
4141
- pwsh: |
42-
$header = "Bearer ${ parameters.token }"
42+
$header = "Bearer ${{ parameters.token }}"
4343
$env:CARGO_REGISTRIES_POWERSHELL_TOKEN = $header
4444
$env:CARGO_REGISTRIES_POWERSHELL_CREDENTIAL_PROVIDER = 'cargo:token'
4545
Set-Location "$(Build.SourcesDirectory)/DSC"

build.ps1

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -219,6 +219,12 @@ if ($null -ne $packageType) {
219219
}
220220
}
221221
}
222+
223+
## Test if tree-sitter is installed
224+
if ($null -eq (Get-Command tree-sitter -ErrorAction Ignore)) {
225+
Write-Verbose -Verbose "tree-sitter not found, installing..."
226+
cargo install tree-sitter-cli
227+
}
222228
}
223229

224230
if (!$SkipBuild -and !$SkipLinkCheck -and $IsWindows -and !(Get-Command 'link.exe' -ErrorAction Ignore)) {

tree-sitter-dscexpression/build.ps1

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@ function Invoke-NativeCommand($cmd) {
1414

1515
$env:TREE_SITTER_VERBOSE=1
1616

17-
if ($null -eq (Get-Command tree-sitter -ErrorAction Ignore)) {
18-
cargo install tree-sitter-cli
19-
}
20-
2117
Invoke-NativeCommand 'tree-sitter init --update'
2218
Invoke-NativeCommand 'tree-sitter generate --build'
2319
Invoke-NativeCommand 'tree-sitter test'

tree-sitter-ssh-server-config/build.ps1

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,6 @@ function Invoke-NativeCommand($cmd) {
99

1010
$env:TREE_SITTER_VERBOSE=1
1111

12-
if ($null -eq (Get-Command tree-sitter -ErrorAction Ignore)) {
13-
cargo install tree-sitter-cli
14-
}
15-
1612
Invoke-NativeCommand 'tree-sitter init --update'
1713
Invoke-NativeCommand 'tree-sitter generate --build'
1814
Invoke-NativeCommand 'tree-sitter test'

0 commit comments

Comments
 (0)