authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2022-10-27 20:57:21-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2022-10-27 20:57:21-07:00
log23878aec4ab2120b74a18a110eb1d3d497e125af
tree4df140b5f1b5c02fa547e9fef858dd76f1c9d109
parent1f4f8d34a1e607a1189280cc0f809c851431a520

CI: azure: fix upload script

Partial revert of changes made in 398a3aae40bc03f6b7c6cd86d78a4cde125f2811, fixes regression.

1 files changed, 8 insertions(+), 9 deletions(-)

ci/azure/pipelines.yml+8-9
...@@ -93,7 +93,6 @@ jobs:...@@ -93,7 +93,6 @@ jobs:
93 secureFile: aws_credentials93 secureFile: aws_credentials
9494
95 - pwsh: |95 - pwsh: |
96 Set-Variable -Name ZIGINSTALLDIR -Value "$(Get-Location)\stage3-release"
97 $Env:AWS_SHARED_CREDENTIALS_FILE = "$Env:DOWNLOADSECUREFILE_SECUREFILEPATH"96 $Env:AWS_SHARED_CREDENTIALS_FILE = "$Env:DOWNLOADSECUREFILE_SECUREFILEPATH"
9897
99 # Workaround Azure networking issue98 # Workaround Azure networking issue
...@@ -101,15 +100,15 @@ jobs:...@@ -101,15 +100,15 @@ jobs:
101 $Env:AWS_EC2_METADATA_DISABLED = "true"100 $Env:AWS_EC2_METADATA_DISABLED = "true"
102 $Env:AWS_REGION = "us-west-2"101 $Env:AWS_REGION = "us-west-2"
103102
104 mv LICENSE "$ZIGINSTALLDIR"103 mv LICENSE stage3-release/
105 mv zig-cache/langref.html "$ZIGINSTALLDIR"104 mv zig-cache/langref.html stage3-release/
106 mv "$ZIGINSTALLDIR\bin\zig.exe" "$ZIGINSTALLDIR\doc\"105 mv stage3-release/bin/zig.exe stage3-release/
107 rmdir "$ZIGINSTALLDIR/bin"106 rmdir stage3-release/bin
108107
109 # Remove the unnecessary zig dir in $ZIGINSTALLDIR\lib\zig\std\std.zig108 # Remove the unnecessary zig dir in $prefix/lib/zig/std/std.zig
110 mv "$ZIGINSTALLDIR\lib\zig" "$ZIGINSTALLDIR\lib2"109 mv stage3-release/lib/zig stage3-release/lib2
111 rmdir "$ZIGINSTALLDIR\lib"110 rmdir stage3-release/lib
112 mv "$ZIGINSTALLDIR\lib2" "$ZIGINSTALLDIR\lib"111 mv stage3-release/lib2 stage3-release/lib
113112
114 Set-Variable -Name VERSION -Value $(./stage3-release/zig.exe version)113 Set-Variable -Name VERSION -Value $(./stage3-release/zig.exe version)
115 Set-Variable -Name DIRNAME -Value "zig-windows-x86_64-$VERSION"114 Set-Variable -Name DIRNAME -Value "zig-windows-x86_64-$VERSION"