2
0
Эх сурвалжийг харах

Merge branch 'master' into insider

Baptiste Augrain 2 жил өмнө
parent
commit
3a0ac5f70e

+ 1 - 0
.github/workflows/linux.yml

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

+ 1 - 0
.github/workflows/macos.yml

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

+ 1 - 0
.github/workflows/windows.yml

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

+ 5 - 1
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

+ 1 - 1
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; }
 

+ 7 - 5
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}"