From 8c04967b7ef89858f8d701bc5f8786ba2ab78d76 Mon Sep 17 00:00:00 2001
From: Peter Squicciarini <stripedpajamas273@gmail.com>
Date: Mon, 5 Oct 2020 17:54:42 -0700
Subject: [PATCH] (experiment) remove further BUILDARCH branches and
s/armhf/arm/
---
.github/workflows/linux.yml | 2 +-
create_appimage.sh | 2 +-
prepare_vscode.sh | 9 +--------
3 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 4089b48..b9a83ff 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -27,7 +27,7 @@ jobs:
- vscode_arch: arm64
npm_arch: arm64
image: vscodium/vscodium-linux-build-agent:buster-arm64
- - vscode_arch: armhf
+ - vscode_arch: arm
npm_arch: armv7l
image: vscodium/vscodium-linux-build-agent:buster-armhf
diff --git a/create_appimage.sh b/create_appimage.sh
index 9b80ac3..089f0e9 100755
--- a/create_appimage.sh
+++ b/create_appimage.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-if [[ "$BUILDARCH" == "x64" ]]; then
+if [[ "$VSCODE_ARCH" == "x64" ]]; then
# install a dep needed for this process
sudo apt-get install desktop-file-utils
diff --git a/prepare_vscode.sh b/prepare_vscode.sh
index 48a4f66..11cda1f 100755
--- a/prepare_vscode.sh
+++ b/prepare_vscode.sh
@@ -2,7 +2,7 @@
set -e
-if [[ "$OS_NAME" != "osx" ]]; then
+if [[ "$CI_WINDOWS" == "True" ]]; then
export npm_config_arch="$BUILDARCH"
export npm_config_target_arch="$BUILDARCH"
fi
@@ -23,13 +23,6 @@ else
yarn postinstall
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
# set fields in product.json