From 59389da1b07292f9d926766251497408dcdd552d Mon Sep 17 00:00:00 2001
From: Baptiste Augrain <daiyam@zokugun.org>
Date: Thu, 10 Nov 2022 18:18:26 +0100
Subject: [PATCH] fix: remote dependencies (#1324)
---
.github/workflows/insider-linux.yml | 3 +--
.github/workflows/stable-linux.yml | 3 +--
.gitignore | 1 +
build.sh | 4 ++++
install_remote_dependencies.sh | 2 ++
5 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/.github/workflows/insider-linux.yml b/.github/workflows/insider-linux.yml
index 71d288d..55e9b93 100644
--- a/.github/workflows/insider-linux.yml
+++ b/.github/workflows/insider-linux.yml
@@ -108,7 +108,7 @@ jobs:
uses: actions/upload-artifact@v3
with:
name: remote-dependencies-${{ matrix.vscode_arch }}
- path: ./vscode/remote/node_modules
+ path: ./remote-dependencies.tar
retention-days: ${{ needs.check.outputs.SHOULD_DEPLOY == 'yes' && 30 || 1 }}
build:
@@ -175,7 +175,6 @@ jobs:
uses: actions/download-artifact@v3
with:
name: remote-dependencies-${{ matrix.vscode_arch }}
- path: ./vscode/remote/node_modules
if: env.SHOULD_BUILD == 'yes' && matrix.vscode_arch == 'x64'
- name: Build
diff --git a/.github/workflows/stable-linux.yml b/.github/workflows/stable-linux.yml
index 2cb37cb..8ee45ed 100644
--- a/.github/workflows/stable-linux.yml
+++ b/.github/workflows/stable-linux.yml
@@ -102,7 +102,7 @@ jobs:
uses: actions/upload-artifact@v3
with:
name: remote-dependencies-${{ matrix.vscode_arch }}
- path: ./vscode/remote/node_modules
+ path: ./remote-dependencies.tar
retention-days: ${{ needs.check.outputs.SHOULD_DEPLOY == 'yes' && 30 || 1 }}
build:
@@ -167,7 +167,6 @@ jobs:
uses: actions/download-artifact@v3
with:
name: remote-dependencies-${{ matrix.vscode_arch }}
- path: ./vscode/remote/node_modules
if: env.SHOULD_BUILD == 'yes' && matrix.vscode_arch == 'x64'
- name: Build
diff --git a/.gitignore b/.gitignore
index 7c9d48c..ae2f656 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@ build/linux/appimage/VSCodium
build/windows/msi/releasedir
build/windows/msi/Files*.wxs
build/windows/msi/Files*.wixobj
+remote-dependencies.tar
diff --git a/build.sh b/build.sh
index 25b953b..19d6b31 100755
--- a/build.sh
+++ b/build.sh
@@ -2,6 +2,10 @@
set -ex
+if [ -f "./remote-dependencies.tar" ]; then
+ tar -xf ./remote-dependencies.tar ./vscode/remote/node_modules
+fi
+
. version.sh
if [[ "${SHOULD_BUILD}" == "yes" ]]; then
diff --git a/install_remote_dependencies.sh b/install_remote_dependencies.sh
index 299dd11..42b60f9 100755
--- a/install_remote_dependencies.sh
+++ b/install_remote_dependencies.sh
@@ -7,3 +7,5 @@ cd vscode || { echo "'vscode' dir not found"; exit 1; }
yarn --cwd remote --frozen-lockfile --check-files
cd ..
+
+tar -cf remote-dependencies.tar ./vscode/remote/node_modules