Merge branch 'master' into insider
This commit is contained in:
commit
3a0ac5f70e
6 changed files with 16 additions and 7 deletions
1
.github/workflows/linux.yml
vendored
1
.github/workflows/linux.yml
vendored
|
@ -9,6 +9,7 @@ on:
|
|||
schedule:
|
||||
- cron: '0 0 * * *'
|
||||
push:
|
||||
branches: [ master ]
|
||||
pull_request:
|
||||
branches: [ master ]
|
||||
|
||||
|
|
1
.github/workflows/macos.yml
vendored
1
.github/workflows/macos.yml
vendored
|
@ -9,6 +9,7 @@ on:
|
|||
schedule:
|
||||
- cron: '0 0 * * *'
|
||||
push:
|
||||
branches: [ master ]
|
||||
pull_request:
|
||||
branches: [ master ]
|
||||
|
||||
|
|
1
.github/workflows/windows.yml
vendored
1
.github/workflows/windows.yml
vendored
|
@ -9,6 +9,7 @@ on:
|
|||
schedule:
|
||||
- cron: '0 0 * * *'
|
||||
push:
|
||||
branches: [ master ]
|
||||
pull_request:
|
||||
branches: [ master ]
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
2
utils.sh
2
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; }
|
||||
|
||||
|
|
10
version.sh
10
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 ..
|
||||
|
||||
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}"
|
||||
|
||||
|
|
Loading…
Reference in a new issue