Skip to content

Commit bdd1043

Browse files
SteveL-MSFTSteveL-MSFT
committed
Only build linux musl
1 parent 27fe013 commit bdd1043

File tree

17 files changed

+145
-137
lines changed

17 files changed

+145
-137
lines changed

‎.cargo/config.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
registry-auth = true
44

55
[registries]
6-
POWERSHELL = { index = "sparse+https://pkgs.dev.azure.com/powershell/PowerShell/_packaging/powershell/Cargo/index/" }
6+
POWERSHELL = { index = "sparse+https://pkgs.dev.azure.com/powershell/PowerShell/_packaging/powershell~force-auth/Cargo/index/" }
77

88
[registry]
99
global-credential-providers = ["cargo:token"]

‎.github/workflows/rust.yml

+10-10
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,18 @@ env:
1515
CARGO_TERM_COLOR: always
1616

1717
jobs:
18-
build-linux:
18+
# build-linux:
1919

20-
runs-on: ubuntu-latest
20+
# runs-on: ubuntu-latest
2121

22-
steps:
23-
- uses: actions/checkout@v3
24-
- name: Build
25-
shell: pwsh
26-
run: ./build.ps1 -clippy
27-
- name: Run tests
28-
shell: pwsh
29-
run: ./build.ps1 -test
22+
# steps:
23+
# - uses: actions/checkout@v3
24+
# - name: Build
25+
# shell: pwsh
26+
# run: ./build.ps1 -clippy
27+
# - name: Run tests
28+
# shell: pwsh
29+
# run: ./build.ps1 -test
3030

3131
build-musl:
3232

‎.pipelines/DSC-Official.yml

+57-57
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ pr:
55
branches:
66
include:
77
- onebranch
8-
- release*
8+
- v3.*
99

1010
schedules:
1111
- cron: '0 3 * * 1'
@@ -33,7 +33,7 @@ extends:
3333
template: v2/OneBranch.Official.CrossPlat.yml@onebranchTemplates
3434
parameters:
3535
featureFlags:
36-
WindowsHostVersion:
36+
WindowsHostVersion:
3737
Disk: Large
3838
Version: 2022
3939
Network: KS1 # note that this property is sticky so commenting out will use the previous set one
@@ -59,7 +59,7 @@ extends:
5959
apiscan:
6060
enabled: false
6161

62-
stages:
62+
stages:
6363
- stage: BuildAndSign
6464
displayName: Build Native Binaries
6565
dependsOn: []
@@ -225,61 +225,61 @@ extends:
225225
displayName: 'Create msixbundle'
226226
condition: succeeded()
227227
228-
- job: BuildLinux
229-
dependsOn: SetPackageVersion
230-
variables:
231-
LinuxContainerImage: 'onebranch.azurecr.io/linux/ubuntu-2204:latest'
232-
PackageVersion: $[ dependencies.SetPackageVersion.outputs['Package.Version'] ]
233-
ob_outputDirectory: '$(Build.ArtifactStagingDirectory)'
234-
displayName: Linux-x64-gnu
235-
pool:
236-
type: linux
237-
steps:
238-
- task: RustInstaller@1
239-
inputs:
240-
rustVersion: ms-stable
241-
toolchainFeed: https://pkgs.dev.azure.com/mscodehub/Rust/_packaging/Rust/nuget/v3/index.json
242-
additionalTargets: x86_64-unknown-linux-gnu
243-
displayName: Install Rust
244-
env:
245-
ob_restore_phase: true
246-
- pwsh: |
247-
./build.ps1 -Release -Architecture x86_64-unknown-linux-gnu
248-
./build.ps1 -PackageType tgz -Architecture x86_64-unknown-linux-gnu -Release
249-
Copy-Item ./bin/*.tar.gz "$(ob_outputDirectory)"
250-
displayName: 'Build x86_64-unknown-linux-gnu'
251-
condition: succeeded()
228+
# - job: BuildLinux
229+
# dependsOn: SetPackageVersion
230+
# variables:
231+
# LinuxContainerImage: 'onebranch.azurecr.io/linux/ubuntu-2204:latest'
232+
# PackageVersion: $[ dependencies.SetPackageVersion.outputs['Package.Version'] ]
233+
# ob_outputDirectory: '$(Build.ArtifactStagingDirectory)'
234+
# displayName: Linux-x64-gnu
235+
# pool:
236+
# type: linux
237+
# steps:
238+
# - task: RustInstaller@1
239+
# inputs:
240+
# rustVersion: ms-stable
241+
# toolchainFeed: https://pkgs.dev.azure.com/mscodehub/Rust/_packaging/Rust/nuget/v3/index.json
242+
# additionalTargets: x86_64-unknown-linux-gnu
243+
# displayName: Install Rust
244+
# env:
245+
# ob_restore_phase: true
246+
# - pwsh: |
247+
# ./build.ps1 -Release -Architecture x86_64-unknown-linux-gnu
248+
# ./build.ps1 -PackageType tgz -Architecture x86_64-unknown-linux-gnu -Release
249+
# Copy-Item ./bin/*.tar.gz "$(ob_outputDirectory)"
250+
# displayName: 'Build x86_64-unknown-linux-gnu'
251+
# condition: succeeded()
252252

253-
- job: BuildLinuxArm64
254-
dependsOn: SetPackageVersion
255-
variables:
256-
LinuxContainerImage: 'onebranch.azurecr.io/linux/ubuntu-2004-arm64:latest'
257-
PackageVersion: $[ dependencies.SetPackageVersion.outputs['Package.Version'] ]
258-
ob_outputDirectory: '$(Build.ArtifactStagingDirectory)'
259-
displayName: Linux-ARM64-gnu
260-
pool:
261-
type: linux
262-
hostArchitecture: arm64
263-
steps:
264-
- task: RustInstaller@1
265-
inputs:
266-
rustVersion: ms-stable
267-
toolchainFeed: https://pkgs.dev.azure.com/mscodehub/Rust/_packaging/Rust/nuget/v3/index.json
268-
additionalTargets: aarch64-unknown-linux-gnu
269-
displayName: Install Rust
270-
env:
271-
ob_restore_phase: true
272-
- pwsh: |
273-
apt update
274-
apt -y install gcc-aarch64-linux-gnu
275-
if ((openssl version -d) -match 'OPENSSLDIR: "(?<dir>.*?)"') {
276-
$env:OPENSSL_LIB_DIR = $matches['dir']
277-
}
278-
./build.ps1 -Release -Architecture aarch64-unknown-linux-gnu
279-
./build.ps1 -PackageType tgz -Architecture aarch64-unknown-linux-gnu -Release
280-
Copy-Item ./bin/*.tar.gz "$(ob_outputDirectory)"
281-
displayName: 'Build aarch64-unknown-linux-gnu'
282-
condition: succeeded()
253+
# - job: BuildLinuxArm64
254+
# dependsOn: SetPackageVersion
255+
# variables:
256+
# LinuxContainerImage: 'onebranch.azurecr.io/linux/ubuntu-2004-arm64:latest'
257+
# PackageVersion: $[ dependencies.SetPackageVersion.outputs['Package.Version'] ]
258+
# ob_outputDirectory: '$(Build.ArtifactStagingDirectory)'
259+
# displayName: Linux-ARM64-gnu
260+
# pool:
261+
# type: linux
262+
# hostArchitecture: arm64
263+
# steps:
264+
# - task: RustInstaller@1
265+
# inputs:
266+
# rustVersion: ms-stable
267+
# toolchainFeed: https://pkgs.dev.azure.com/mscodehub/Rust/_packaging/Rust/nuget/v3/index.json
268+
# additionalTargets: aarch64-unknown-linux-gnu
269+
# displayName: Install Rust
270+
# env:
271+
# ob_restore_phase: true
272+
# - pwsh: |
273+
# apt update
274+
# apt -y install gcc-aarch64-linux-gnu
275+
# if ((openssl version -d) -match 'OPENSSLDIR: "(?<dir>.*?)"') {
276+
# $env:OPENSSL_LIB_DIR = $matches['dir']
277+
# }
278+
# ./build.ps1 -Release -Architecture aarch64-unknown-linux-gnu
279+
# ./build.ps1 -PackageType tgz -Architecture aarch64-unknown-linux-gnu -Release
280+
# Copy-Item ./bin/*.tar.gz "$(ob_outputDirectory)"
281+
# displayName: 'Build aarch64-unknown-linux-gnu'
282+
# condition: succeeded()
283283

284284
- job: BuildLinuxMusl
285285
dependsOn: SetPackageVersion

‎.vscode/settings.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,6 @@
2525
"sarif-viewer.connectToGithubCodeScanning": "off",
2626
"vscode-nmake-tools.workspaceBuildDirectories": [
2727
"."
28-
]
28+
],
29+
"azure-pipelines.1ESPipelineTemplatesSchemaFile": true
2930
}

‎build.ps1

+7
Original file line numberDiff line numberDiff line change
@@ -655,6 +655,13 @@ if ($packageType -eq 'msixbundle') {
655655
}
656656
}
657657

658+
# for Linux, we only build musl as its statically linked, so we remove the musl suffix
659+
if ($architecture -eq 'aarch64-unknown-linux-musl') {
660+
$architecture = 'aarch64-linux'
661+
} elseif ($architecture -eq 'x86_64-unknown-linux-musl') {
662+
$architecture = 'x86_64-linux'
663+
}
664+
658665
$packageName = "DSC-$productVersion-$architecture.tar"
659666
$tarFile = Join-Path $PSScriptRoot 'bin' $packageName
660667
tar cvf $tarFile -C $tgzTarget .

‎dsc/Cargo.lock

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dsc/Cargo.toml

+14-14
Original file line numberDiff line numberDiff line change
@@ -11,22 +11,22 @@ opt-level = 2
1111
lto = true
1212

1313
[dependencies]
14-
clap = { version = "4.5.17", features = ["derive"] }
15-
clap_complete = { version = "4.5.28" }
16-
crossterm = { version = "0.28.1" }
17-
ctrlc = { version = "3.4.0" }
14+
clap = { version = "4.5", features = ["derive"] }
15+
clap_complete = { version = "4.5" }
16+
crossterm = { version = "0.28" }
17+
ctrlc = { version = "3.4" }
1818
dsc_lib = { path = "../dsc_lib" }
1919
indicatif = { version = "0.17" }
20-
jsonschema = { version = "0.23.0", default-features = false }
21-
path-absolutize = { version = "3.1.1" }
20+
jsonschema = { version = "0.23", default-features = false }
21+
path-absolutize = { version = "3.1" }
2222
# reqwest = { version = "0.12.8", features = ["native-tls"], default-features = false }
23-
schemars = { version = "0.8.12" }
24-
serde = { version = "1.0.210", features = ["derive"] }
25-
serde_json = { version = "1.0.128", features = ["preserve_order"] }
26-
serde_yaml = { version = "0.9.3" }
23+
schemars = { version = "0.8" }
24+
serde = { version = "1.0", features = ["derive"] }
25+
serde_json = { version = "1.0", features = ["preserve_order"] }
26+
serde_yaml = { version = "0.9" }
2727
syntect = { version = "5.0", features = ["default-fancy"], default-features = false }
28-
sysinfo = { version = "0.32.0" }
29-
thiserror = "1.0.52"
28+
sysinfo = { version = "0.32" }
29+
thiserror = "1.0"
3030
tracing = { version = "0.1.37" }
31-
tracing-subscriber = { version = "0.3.17", features = ["ansi", "env-filter", "json"] }
32-
tracing-indicatif = { version = "0.3.6" }
31+
tracing-subscriber = { version = "0.3", features = ["ansi", "env-filter", "json"] }
32+
tracing-indicatif = { version = "0.3" }

‎dsc_lib/Cargo.lock

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dsc_lib/Cargo.toml

+21-21
Original file line numberDiff line numberDiff line change
@@ -4,32 +4,32 @@ version = "3.0.0"
44
edition = "2021"
55

66
[dependencies]
7-
base64 = "0.22.1"
8-
chrono = "0.4.26"
9-
clap = { version = "4.5.17", features = ["derive"] }
10-
derive_builder ="0.20.1"
11-
indicatif = "0.17.0"
12-
jsonschema = { version = "0.23.0", default-features = false }
13-
linked-hash-map = "0.5.6"
14-
num-traits = "0.2.14"
15-
regex = "1.7.0"
7+
base64 = "0.22"
8+
chrono = "0.4"
9+
clap = { version = "4.5", features = ["derive"] }
10+
derive_builder ="0.20"
11+
indicatif = "0.17"
12+
jsonschema = { version = "0.23", default-features = false }
13+
linked-hash-map = "0.5"
14+
num-traits = "0.2"
15+
regex = "1.11"
1616
# reqwest = { version = "0.12.8", features = ["native-tls"], default-features = false }
17-
schemars = { version = "0.8.12", features = ["preserve_order"] }
18-
serde = { version = "1.0.210", features = ["derive"] }
19-
serde_json = { version = "1.0.128", features = ["preserve_order"] }
20-
serde_yaml = { version = "0.9.3" }
21-
thiserror = "1.0.0"
17+
schemars = { version = "0.8", features = ["preserve_order"] }
18+
serde = { version = "1.0", features = ["derive"] }
19+
serde_json = { version = "1.0", features = ["preserve_order"] }
20+
serde_yaml = { version = "0.9" }
21+
thiserror = "1.0"
2222
security_context_lib = { path = "../security_context_lib" }
23-
semver = "1.0.0"
24-
tokio = { version = "1.40.0", features = ["full"] }
25-
tracing = "0.1.37"
26-
tracing-indicatif = { version = "0.3.6" }
27-
tree-sitter = "0.24.3"
28-
tree-sitter-rust = "0.23.0"
23+
semver = "1.0"
24+
tokio = { version = "1.41", features = ["full"] }
25+
tracing = "0.1"
26+
tracing-indicatif = { version = "0.3" }
27+
tree-sitter = "0.24"
28+
tree-sitter-rust = "0.23"
2929
tree-sitter-dscexpression = { path = "../tree-sitter-dscexpression" }
3030

3131
[dev-dependencies]
32-
serde_yaml = "0.9.3"
32+
serde_yaml = "0.9"
3333

3434
[build-dependencies]
3535
cc="1.1"

‎osinfo/Cargo.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ edition = "2021"
66
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
77

88
[dependencies]
9-
os_info = { version = "3.7.0" }
10-
serde = { version = "1.0.0", features = ["derive"] }
11-
serde_json = { version = "1.0.0", features = ["preserve_order"] }
9+
os_info = { version = "3.7" }
10+
serde = { version = "1.0", features = ["derive"] }
11+
serde_json = { version = "1.0", features = ["preserve_order"] }

‎pal/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ opt-level = 2
1313
lto = true
1414

1515
[build-dependencies]
16-
cc = "1.1.20"
16+
cc = "1.1"

‎process/Cargo.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ version = "0.1.0"
44
edition = "2021"
55

66
[dependencies]
7-
sysinfo = "0.31.2"
8-
serde = { version = "1.0.0", features = ["derive"] }
9-
serde_json = { version = "1.0.0", features = ["preserve_order"] }
7+
sysinfo = "0.31"
8+
serde = { version = "1.0", features = ["derive"] }
9+
serde_json = { version = "1.0", features = ["preserve_order"] }

‎registry/Cargo.toml

+10-10
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,16 @@ lto = true
1414
lto = true
1515

1616
[dependencies]
17-
clap = { version = "4.5.20", features = ["derive"] }
18-
crossterm = "0.28.1"
19-
registry = "1.2.3"
20-
schemars = "0.8.0"
21-
serde = "1.0.130"
22-
serde_json = "1.0.68"
23-
thiserror = "1.0.64"
24-
tracing = { version = "0.1.37" }
25-
tracing-subscriber = { version = "0.3.17", features = ["ansi", "env-filter", "json"] }
26-
utfx = "0.1.0"
17+
clap = { version = "4.5", features = ["derive"] }
18+
crossterm = "0.28"
19+
registry = "1.2"
20+
schemars = "0.8"
21+
serde = "1.0"
22+
serde_json = "1.0"
23+
thiserror = "1.0"
24+
tracing = { version = "0.1" }
25+
tracing-subscriber = { version = "0.3", features = ["ansi", "env-filter", "json"] }
26+
utfx = "0.1"
2727

2828
[build-dependencies]
2929
static_vcruntime = "2.0"

‎runcommandonset/Cargo.toml

+5-5
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ edition = "2021"
66
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
77

88
[dependencies]
9-
clap = { version = "4.4.0", features = ["derive"] }
10-
serde = { version = "1.0.0", features = ["derive"] }
11-
serde_json = { version = "1.0.0", features = ["preserve_order"] }
12-
tracing = { version = "0.1.37" }
13-
tracing-subscriber = { version = "0.3.17", features = ["ansi", "env-filter", "json"] }
9+
clap = { version = "4.4", features = ["derive"] }
10+
serde = { version = "1.0", features = ["derive"] }
11+
serde_json = { version = "1.0", features = ["preserve_order"] }
12+
tracing = { version = "0.1" }
13+
tracing-subscriber = { version = "0.3", features = ["ansi", "env-filter", "json"] }

‎security_context_lib/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ version = "0.1.0"
44
edition = "2021"
55

66
[target.'cfg(target_os = "windows")'.dependencies]
7-
is_elevated = "0.1.0"
7+
is_elevated = "0.1"
88

99
[target.'cfg(not(target_os = "windows"))'.dependencies]
10-
nix = { version = "0.29.0", features = ["user"] }
10+
nix = { version = "0.29", features = ["user"] }

0 commit comments

Comments
 (0)