Skip to content

Commit 6b8ee3a

Browse files
committed
fix: use vsceTarget to rustTarget when pulling pet
1 parent b01d2b8 commit 6b8ee3a

2 files changed

Lines changed: 58 additions & 2 deletions

File tree

build/azure-pipeline.pre-release.yml

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,34 @@ extends:
9090
chmod +x $(Build.SourcesDirectory)/python-env-tools/bin
9191
displayName: Make Directory for python-env-tool binary
9292
93+
- bash: |
94+
if [ "${{ parameters.vsceTarget }}" == "win32-x64" ]; then
95+
echo "##vso[task.setvariable variable=buildTarget]x86_64-pc-windows-msvc"
96+
elif [ "${{ parameters.vsceTarget }}" == "win32-arm64" ]; then
97+
echo "##vso[task.setvariable variable=buildTarget]aarch64-pc-windows-msvc"
98+
elif [ "${{ parameters.vsceTarget }}" == "linux-x64" ]; then
99+
echo "##vso[task.setvariable variable=buildTarget]x86_64-unknown-linux-musl"
100+
elif [ "${{ parameters.vsceTarget }}" == "linux-arm64" ]; then
101+
echo "##vso[task.setvariable variable=buildTarget]aarch64-unknown-linux-gnu"
102+
elif [ "${{ parameters.vsceTarget }}" == "linux-armhf" ]; then
103+
echo "##vso[task.setvariable variable=buildTarget]armv7-unknown-linux-gnueabihf"
104+
elif [ "${{ parameters.vsceTarget }}" == "darwin-x64" ]; then
105+
echo "##vso[task.setvariable variable=buildTarget]x86_64-apple-darwin"
106+
elif [ "${{ parameters.vsceTarget }}" == "darwin-arm64" ]; then
107+
echo "##vso[task.setvariable variable=buildTarget]aarch64-apple-darwin"
108+
elif [ "${{ parameters.vsceTarget }}" == "alpine-x64" ]; then
109+
echo "##vso[task.setvariable variable=buildTarget]x86_64-unknown-linux-musl"
110+
elif [ "${{ parameters.vsceTarget }}" == "alpine-arm64" ]; then
111+
echo "##vso[task.setvariable variable=buildTarget]aarch64-unknown-linux-gnu"
112+
elif [ "${{ parameters.vsceTarget }}" == "web" ] && [ "${{ parameters.buildWasm }}" == "true" ]; then
113+
echo "##vso[task.setvariable variable=buildTarget]wasm32-wasi"
114+
elif [ "${{ parameters.vsceTarget }}" == "web" ] && [ "${{ parameters.buildWasm }}" == "false" ]; then
115+
echo "##vso[task.setvariable variable=buildTarget]x86_64-unknown-linux-musl"
116+
else
117+
echo "##vso[task.setvariable variable=buildTarget]x86_64-unknown-linux-musl"
118+
fi
119+
displayName: Set buildTarget variable
120+
93121
- task: DownloadPipelineArtifact@2
94122
inputs:
95123
buildType: 'specific'
@@ -98,7 +126,7 @@ extends:
98126
buildVersionToDownload: 'latest'
99127
branchName: 'refs/heads/main'
100128
targetPath: '$(Build.SourcesDirectory)/python-env-tools/bin'
101-
artifactName: 'bin-$(vsceTarget)'
129+
artifactName: 'bin-$(buildTarget)'
102130
itemPattern: |
103131
pet.exe
104132
pet

build/azure-pipeline.stable.yml

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,34 @@ extends:
8080
chmod +x $(Build.SourcesDirectory)/python-env-tools/bin
8181
displayName: Make Directory for python-env-tool binary
8282
83+
- bash: |
84+
if [ "${{ parameters.vsceTarget }}" == "win32-x64" ]; then
85+
echo "##vso[task.setvariable variable=buildTarget]x86_64-pc-windows-msvc"
86+
elif [ "${{ parameters.vsceTarget }}" == "win32-arm64" ]; then
87+
echo "##vso[task.setvariable variable=buildTarget]aarch64-pc-windows-msvc"
88+
elif [ "${{ parameters.vsceTarget }}" == "linux-x64" ]; then
89+
echo "##vso[task.setvariable variable=buildTarget]x86_64-unknown-linux-musl"
90+
elif [ "${{ parameters.vsceTarget }}" == "linux-arm64" ]; then
91+
echo "##vso[task.setvariable variable=buildTarget]aarch64-unknown-linux-gnu"
92+
elif [ "${{ parameters.vsceTarget }}" == "linux-armhf" ]; then
93+
echo "##vso[task.setvariable variable=buildTarget]armv7-unknown-linux-gnueabihf"
94+
elif [ "${{ parameters.vsceTarget }}" == "darwin-x64" ]; then
95+
echo "##vso[task.setvariable variable=buildTarget]x86_64-apple-darwin"
96+
elif [ "${{ parameters.vsceTarget }}" == "darwin-arm64" ]; then
97+
echo "##vso[task.setvariable variable=buildTarget]aarch64-apple-darwin"
98+
elif [ "${{ parameters.vsceTarget }}" == "alpine-x64" ]; then
99+
echo "##vso[task.setvariable variable=buildTarget]x86_64-unknown-linux-musl"
100+
elif [ "${{ parameters.vsceTarget }}" == "alpine-arm64" ]; then
101+
echo "##vso[task.setvariable variable=buildTarget]aarch64-unknown-linux-gnu"
102+
elif [ "${{ parameters.vsceTarget }}" == "web" ] && [ "${{ parameters.buildWasm }}" == "true" ]; then
103+
echo "##vso[task.setvariable variable=buildTarget]wasm32-wasi"
104+
elif [ "${{ parameters.vsceTarget }}" == "web" ] && [ "${{ parameters.buildWasm }}" == "false" ]; then
105+
echo "##vso[task.setvariable variable=buildTarget]x86_64-unknown-linux-musl"
106+
else
107+
echo "##vso[task.setvariable variable=buildTarget]x86_64-unknown-linux-musl"
108+
fi
109+
displayName: Set buildTarget variable
110+
83111
- task: DownloadPipelineArtifact@2
84112
inputs:
85113
buildType: 'specific'
@@ -88,7 +116,7 @@ extends:
88116
buildVersionToDownload: 'latestFromBranch'
89117
branchName: 'refs/heads/release/2024.18'
90118
targetPath: '$(Build.SourcesDirectory)/python-env-tools/bin'
91-
artifactName: 'bin-$(vsceTarget)'
119+
artifactName: 'bin-$(buildTarget)'
92120
itemPattern: |
93121
pet.exe
94122
pet

0 commit comments

Comments
 (0)