Merge branch 'master' into insider

This commit is contained in:
Baptiste Augrain 2022-11-10 18:20:15 +01:00
commit 1b48e182cb
5 changed files with 9 additions and 4 deletions

View file

@ -108,7 +108,7 @@ jobs:
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v3
with: with:
name: remote-dependencies-${{ matrix.vscode_arch }} 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 }} retention-days: ${{ needs.check.outputs.SHOULD_DEPLOY == 'yes' && 30 || 1 }}
build: build:
@ -175,7 +175,6 @@ jobs:
uses: actions/download-artifact@v3 uses: actions/download-artifact@v3
with: with:
name: remote-dependencies-${{ matrix.vscode_arch }} name: remote-dependencies-${{ matrix.vscode_arch }}
path: ./vscode/remote/node_modules
if: env.SHOULD_BUILD == 'yes' && matrix.vscode_arch == 'x64' if: env.SHOULD_BUILD == 'yes' && matrix.vscode_arch == 'x64'
- name: Build - name: Build

View file

@ -102,7 +102,7 @@ jobs:
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v3
with: with:
name: remote-dependencies-${{ matrix.vscode_arch }} 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 }} retention-days: ${{ needs.check.outputs.SHOULD_DEPLOY == 'yes' && 30 || 1 }}
build: build:
@ -167,7 +167,6 @@ jobs:
uses: actions/download-artifact@v3 uses: actions/download-artifact@v3
with: with:
name: remote-dependencies-${{ matrix.vscode_arch }} name: remote-dependencies-${{ matrix.vscode_arch }}
path: ./vscode/remote/node_modules
if: env.SHOULD_BUILD == 'yes' && matrix.vscode_arch == 'x64' if: env.SHOULD_BUILD == 'yes' && matrix.vscode_arch == 'x64'
- name: Build - name: Build

1
.gitignore vendored
View file

@ -13,3 +13,4 @@ build/linux/appimage/VSCodium
build/windows/msi/releasedir build/windows/msi/releasedir
build/windows/msi/Files*.wxs build/windows/msi/Files*.wxs
build/windows/msi/Files*.wixobj build/windows/msi/Files*.wixobj
remote-dependencies.tar

View file

@ -2,6 +2,10 @@
set -ex set -ex
if [ -f "./remote-dependencies.tar" ]; then
tar -xf ./remote-dependencies.tar ./vscode/remote/node_modules
fi
. version.sh . version.sh
if [[ "${SHOULD_BUILD}" == "yes" ]]; then if [[ "${SHOULD_BUILD}" == "yes" ]]; then

View file

@ -7,3 +7,5 @@ cd vscode || { echo "'vscode' dir not found"; exit 1; }
yarn --cwd remote --frozen-lockfile --check-files yarn --cwd remote --frozen-lockfile --check-files
cd .. cd ..
tar -cf remote-dependencies.tar ./vscode/remote/node_modules