Skip to content

Commit 8e60f93

Browse files
author
Steve Lee (POWERSHELL HE/HIM) (from Dev Box)
committed
change pipeline to use 1.95
1 parent 2ed158f commit 8e60f93

3 files changed

Lines changed: 14 additions & 7 deletions

File tree

.pipelines/DSC-Official.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ variables:
3131
value: ${{ parameters.OfficialBuild }}
3232
- name: PublishToStore
3333
value: ${{ parameters.PublishToStore }}
34+
- name: RustVersion
35+
value: ms-prod-1.95
3436

3537
resources:
3638
repositories:
@@ -114,6 +116,7 @@ extends:
114116
signSrcPath: '$(signSrcPath)'
115117
PackageRoot: '$(PackageRoot)'
116118
rustSDK: '$(Rust.SDK)'
119+
rustVersion: ${{ variables.RustVersion }}
117120

118121
- job: BuildWin_arm64
119122
dependsOn: SetPackageVersion
@@ -134,7 +137,7 @@ extends:
134137
signSrcPath: '$(signSrcPath)'
135138
PackageRoot: '$(PackageRoot)'
136139
rustSDK: '$(Rust.SDK)'
137-
140+
rustVersion: ${{ variables.RustVersion }}
138141
- job: CreateMsixBundle
139142
dependsOn:
140143
- BuildWin_x64
@@ -283,7 +286,7 @@ extends:
283286
steps:
284287
- task: RustInstaller@1
285288
inputs:
286-
rustVersion: ms-prod-1.93
289+
rustVersion: ${{ variables.RustVersion }}
287290
toolchainFeed: $(Rust.SDK)
288291
additionalTargets: x86_64-unknown-linux-musl
289292
displayName: Install Rust
@@ -317,7 +320,7 @@ extends:
317320
steps:
318321
- task: RustInstaller@1
319322
inputs:
320-
rustVersion: ms-prod-1.93
323+
rustVersion: ${{ variables.RustVersion }}
321324
toolchainFeed: $(Rust.SDK)
322325
additionalTargets: aarch64-unknown-linux-musl
323326
displayName: Install Rust
@@ -375,7 +378,7 @@ extends:
375378
steps:
376379
- task: RustInstaller@1
377380
inputs:
378-
rustVersion: ms-prod-1.93
381+
rustVersion: ${{ variables.RustVersion }}
379382
toolchainFeed: $(Rust.SDK)
380383
additionalTargets: $(buildName)
381384
displayName: Install Rust

.pipelines/DSC-Windows.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ parameters:
1010
default: Release
1111
- name: RustSDK
1212
type: string
13+
- name: RustVersion
14+
type: string
1315

1416
steps:
1517
- pwsh: |
@@ -18,7 +20,7 @@ steps:
1820
displayName: 🛠️ Workaround for the LoadLibrary ACCESS_VIOLATION OneBranch issue
1921
- task: RustInstaller@1
2022
inputs:
21-
rustVersion: ms-prod-1.95
23+
rustVersion: ${{ parameters.RustVersion }}
2224
toolchainFeed: ${{ parameters.RustSDK }}
2325
additionalTargets: ${{ parameters.buildName }}
2426
displayName: Install Rust

build.ps1

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -191,8 +191,10 @@ process {
191191
Set-CargoEnvironment -UseCFS:$UseCFS @VerboseParam
192192

193193
# Install or update rust
194-
Write-BuildProgress @progressParams -Status 'Ensuring Rust is up-to-date'
195-
Update-Rust @VerboseParam
194+
if (!$usingADO) {
195+
Write-BuildProgress @progressParams -Status 'Ensuring Rust is up-to-date'
196+
Update-Rust @VerboseParam
197+
}
196198

197199
if ($Clippy) {
198200
Write-BuildProgress @progressParams -Status 'Ensuring Clippy is available and updated'

0 commit comments

Comments
 (0)