From 7a2a3a7ab03bdeaabac062a8210098918778da72 Mon Sep 17 00:00:00 2001 From: Baptiste Augrain Date: Wed, 17 Aug 2022 07:46:48 +0200 Subject: [PATCH 1/2] ci: disable insider and reh on windows arm64 --- .github/workflows/linux.yml | 1 + .github/workflows/macos.yml | 1 + .github/workflows/windows.yml | 1 + check_tags.sh | 6 +++++- 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index c84a722..715454c 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -9,6 +9,7 @@ on: schedule: - cron: '0 0 * * *' push: + branches: [ master ] pull_request: branches: [ master ] diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index a9b32c3..5373e3c 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -9,6 +9,7 @@ on: schedule: - cron: '0 0 * * *' push: + branches: [ master ] pull_request: branches: [ master ] diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 5765149..9bd78bf 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -9,6 +9,7 @@ on: schedule: - cron: '0 0 * * *' push: + branches: [ master ] pull_request: branches: [ master ] diff --git a/check_tags.sh b/check_tags.sh index b93a3f2..fbddf1d 100755 --- a/check_tags.sh +++ b/check_tags.sh @@ -310,7 +310,11 @@ if [ "${VSCODIUM_ASSETS}" != "null" ]; then fi fi 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 export SHOULD_BUILD_APPIMAGE="no" fi From f21c11dde0ac50bc4d53e86a7ea3d108acce2f20 Mon Sep 17 00:00:00 2001 From: Baptiste Augrain Date: Sun, 21 Aug 2022 19:15:37 +0200 Subject: [PATCH 2/2] fix: install checksum only when needed (#1213) --- utils.sh | 2 +- version.sh | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/utils.sh b/utils.sh index 2084e99..d5f1c43 100755 --- a/utils.sh +++ b/utils.sh @@ -1,6 +1,6 @@ #!/bin/bash -#All common functions can be added to this file +# All common functions can be added to this file exists() { type -t "$1" > /dev/null 2>&1; } diff --git a/version.sh b/version.sh index c6feaef..59ca17d 100755 --- a/version.sh +++ b/version.sh @@ -1,18 +1,20 @@ #!/bin/bash -set -e - if [[ -z "${BUILD_SOURCEVERSION}" ]]; then - npm install -g checksum - vscodium_hash=$( git rev-parse HEAD ) cd vscode vscode_hash=$( git rev-parse HEAD ) cd .. - export BUILD_SOURCEVERSION=$( echo "${vscodium_hash}:${vscode_hash}" | checksum ) + 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 ) + fi echo "Build version: ${BUILD_SOURCEVERSION}"