Update other places Darwin arch is mentioned

This commit is contained in:
Peter Squicciarini 2020-12-14 14:22:48 -08:00
parent 3909371fa4
commit 4782bb2ead
2 changed files with 7 additions and 6 deletions

View File

@ -12,6 +12,7 @@ jobs:
runs-on: macOS-latest
env:
OS_NAME: "osx"
VSCODE_ARCH: "x64"
steps:
- uses: actions/checkout@v2
@ -43,7 +44,7 @@ jobs:
CERTIFICATE_OSX_ID: ${{ secrets.CERTIFICATE_OSX_ID }}
if: env.SHOULD_BUILD == 'yes'
run: |
if [ -d "VSCode-darwin" ]; then # just in case the build failed
if [ -d "VSCode-darwin-${VSCODE_ARCH}" ]; then # just in case the build failed
cd VSCode-darwin
export CERTIFICATE_P12=VSCodium.p12
echo $CERTIFICATE_OSX_P12 | base64 --decode > $CERTIFICATE_P12
@ -58,15 +59,15 @@ jobs:
- name: Zip release
run: |
cd VSCode-darwin
zip -r -X -y ../VSCodium-darwin-${LATEST_MS_TAG}.zip ./*.app
cd "VSCode-darwin-${VSCODE_ARCH}"
zip -r -X -y ../VSCodium-darwin-${VSCODE_ARCH}-${LATEST_MS_TAG}.zip ./*.app
if: env.SHOULD_BUILD == 'yes'
- name: DMG the release
run: |
pushd VSCode-darwin
pushd "VSCode-darwin-${VSCODE_ARCH}"
npx create-dmg VSCodium.app ..
mv "../VSCodium ${LATEST_MS_TAG}.dmg" "../VSCodium.${LATEST_MS_TAG}.dmg"
mv "../VSCodium ${LATEST_MS_TAG}.dmg" "../VSCodium.${VSCODE_ARCH}.${LATEST_MS_TAG}.dmg"
popd
if: env.SHOULD_BUILD == 'yes'

View File

@ -26,7 +26,7 @@ if [[ "$SHOULD_BUILD" == "yes" ]]; then
yarn gulp minify-vscode
if [[ "$OS_NAME" == "osx" ]]; then
yarn gulp vscode-darwin-x64-min-ci
yarn gulp "vscode-darwin-${VSCODE_ARCH}-min-ci"
elif [[ "$CI_WINDOWS" == "True" ]]; then
cp LICENSE.txt LICENSE.rtf # windows build expects rtf license
yarn gulp "vscode-win32-${BUILDARCH}-min-ci"