Merge branch 'master' into insider

This commit is contained in:
Baptiste Augrain 2022-08-21 21:37:54 +02:00
commit 3a0ac5f70e
6 changed files with 16 additions and 7 deletions

View File

@ -9,6 +9,7 @@ on:
schedule: schedule:
- cron: '0 0 * * *' - cron: '0 0 * * *'
push: push:
branches: [ master ]
pull_request: pull_request:
branches: [ master ] branches: [ master ]

View File

@ -9,6 +9,7 @@ on:
schedule: schedule:
- cron: '0 0 * * *' - cron: '0 0 * * *'
push: push:
branches: [ master ]
pull_request: pull_request:
branches: [ master ] branches: [ master ]

View File

@ -9,6 +9,7 @@ on:
schedule: schedule:
- cron: '0 0 * * *' - cron: '0 0 * * *'
push: push:
branches: [ master ]
pull_request: pull_request:
branches: [ master ] branches: [ master ]

View File

@ -310,7 +310,11 @@ if [ "${VSCODIUM_ASSETS}" != "null" ]; then
fi fi
fi fi
else else
if [[ "${OS_NAME}" == "linux" ]]; then if [[ "${OS_NAME}" == "windows" ]]; then
if [[ "${VSCODE_ARCH}" == "arm64" ]]; then
export SHOULD_BUILD_REH="no"
fi
elif [[ "${OS_NAME}" == "linux" ]]; then
if [[ "${VSCODE_ARCH}" != "x64" ]]; then if [[ "${VSCODE_ARCH}" != "x64" ]]; then
export SHOULD_BUILD_APPIMAGE="no" export SHOULD_BUILD_APPIMAGE="no"
fi fi

View File

@ -1,18 +1,20 @@
#!/bin/bash #!/bin/bash
set -e
if [[ -z "${BUILD_SOURCEVERSION}" ]]; then if [[ -z "${BUILD_SOURCEVERSION}" ]]; then
npm install -g checksum
vscodium_hash=$( git rev-parse HEAD ) vscodium_hash=$( git rev-parse HEAD )
cd vscode cd vscode
vscode_hash=$( git rev-parse HEAD ) vscode_hash=$( git rev-parse HEAD )
cd .. cd ..
if type -t "sha1sum" > /dev/null 2>&1; then
export BUILD_SOURCEVERSION=$( echo "${vscodium_hash}:${vscode_hash}" | sha1sum | cut -d' ' -f1 )
else
npm install -g checksum
export BUILD_SOURCEVERSION=$( echo "${vscodium_hash}:${vscode_hash}" | checksum ) export BUILD_SOURCEVERSION=$( echo "${vscodium_hash}:${vscode_hash}" | checksum )
fi
echo "Build version: ${BUILD_SOURCEVERSION}" echo "Build version: ${BUILD_SOURCEVERSION}"