Browse Source

(experiment) remove further BUILDARCH branches and s/armhf/arm/

Peter Squicciarini 4 years ago
parent
commit
8c04967b7e
3 changed files with 3 additions and 10 deletions
  1. 1 1
      .github/workflows/linux.yml
  2. 1 1
      create_appimage.sh
  3. 1 8
      prepare_vscode.sh

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

@@ -27,7 +27,7 @@ jobs:
         - vscode_arch: arm64
         - vscode_arch: arm64
           npm_arch: arm64
           npm_arch: arm64
           image: vscodium/vscodium-linux-build-agent:buster-arm64
           image: vscodium/vscodium-linux-build-agent:buster-arm64
-        - vscode_arch: armhf
+        - vscode_arch: arm
           npm_arch: armv7l
           npm_arch: armv7l
           image: vscodium/vscodium-linux-build-agent:buster-armhf
           image: vscodium/vscodium-linux-build-agent:buster-armhf
 
 

+ 1 - 1
create_appimage.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
 #!/bin/bash
-if [[ "$BUILDARCH" == "x64" ]]; then
+if [[ "$VSCODE_ARCH" == "x64" ]]; then
   # install a dep needed for this process
   # install a dep needed for this process
   sudo apt-get install desktop-file-utils
   sudo apt-get install desktop-file-utils
 
 

+ 1 - 8
prepare_vscode.sh

@@ -2,7 +2,7 @@
 
 
 set -e
 set -e
 
 
-if [[ "$OS_NAME" != "osx" ]]; then
+if [[ "$CI_WINDOWS" == "True" ]]; then
   export npm_config_arch="$BUILDARCH"
   export npm_config_arch="$BUILDARCH"
   export npm_config_target_arch="$BUILDARCH"
   export npm_config_target_arch="$BUILDARCH"
 fi
 fi
@@ -23,13 +23,6 @@ else
   yarn postinstall
   yarn postinstall
 fi
 fi
 
 
-if [[ "$BUILDARCH" == *"arm"* ]]; then
-  sed -i -z 's/,\n[^\n]*arm[^\n]*//' node_modules/vscode-sqlite3/binding.gyp
-  sed -i "s/Release\/sqlite'/Release\/sqlite.node'/" node_modules/vscode-sqlite3/lib/sqlite3.js
-  yarn add -D electron-rebuild
-  npx electron-rebuild -f -w vscode-sqlite3
-fi
-
 mv product.json product.json.bak
 mv product.json product.json.bak
 
 
 # set fields in product.json
 # set fields in product.json