Browse Source

ci(linux): use bionic build agents [skip ci]

Baptiste Augrain 1 year ago
parent
commit
db835abaf1
2 changed files with 29 additions and 11 deletions
  1. 20 2
      .github/workflows/insider-linux.yml
  2. 9 9
      prepare_vscode.sh

+ 20 - 2
.github/workflows/insider-linux.yml

@@ -32,18 +32,36 @@ env:
 jobs:
   build:
     runs-on: ubuntu-20.04
+    # strategy:
+    #   fail-fast: false
+    #   matrix:
+    #     include:
+    #     - vscode_arch: x64
+    #       npm_arch: x64
+    #     - vscode_arch: arm64
+    #       npm_arch: arm64
+    #     - vscode_arch: armhf
+    #       npm_arch: arm
+    #     # - vscode_arch: ppc64le
+    #     #   npm_arch: ppc64
     strategy:
       fail-fast: false
       matrix:
         include:
         - vscode_arch: x64
           npm_arch: x64
+          image: vscodium/vscodium-linux-build-agent:bionic-x64
         - vscode_arch: arm64
           npm_arch: arm64
+          image: vscodium/vscodium-linux-build-agent:bionic-arm64
         - vscode_arch: armhf
           npm_arch: arm
-        # - vscode_arch: ppc64le
-        #   npm_arch: ppc64
+          image: vscodium/vscodium-linux-build-agent:bionic-armhf
+        - vscode_arch: ppc64le
+          npm_arch: ppc64
+          image: vscodium/vscodium-linux-build-agent:bionic-ppc64le
+    container:
+      image: ${{ matrix.image }}
     env:
       DISABLE_UPDATE: 'yes'
       VSCODE_ARCH: ${{ matrix.vscode_arch }}

+ 9 - 9
prepare_vscode.sh

@@ -93,15 +93,15 @@ if [[ "${OS_NAME}" == "linux" ]]; then
 
     export VSCODE_HOST_MOUNT
 
-    if [[ "${VSCODE_ARCH}" == "x64" || "${VSCODE_ARCH}" == "arm64" ]]; then
-      VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME="vscodium/vscodium-linux-build-agent:centos7-devtoolset8-${VSCODE_ARCH}"
-    elif [[ "${VSCODE_ARCH}" == "armhf" ]]; then
-      VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME="vscodium/vscodium-linux-build-agent:bionic-devtoolset-arm32v7"
-    elif [[ "${VSCODE_ARCH}" == "ppc64le" ]]; then
-      VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME="vscodium/vscodium-linux-build-agent:bionic-devtoolset-ppc64le"
-    fi
-
-    export VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME
+    # if [[ "${VSCODE_ARCH}" == "x64" || "${VSCODE_ARCH}" == "arm64" ]]; then
+    #   VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME="vscodium/vscodium-linux-build-agent:centos7-devtoolset8-${VSCODE_ARCH}"
+    # elif [[ "${VSCODE_ARCH}" == "armhf" ]]; then
+    #   VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME="vscodium/vscodium-linux-build-agent:bionic-devtoolset-arm32v7"
+    # elif [[ "${VSCODE_ARCH}" == "ppc64le" ]]; then
+    #   VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME="vscodium/vscodium-linux-build-agent:bionic-devtoolset-ppc64le"
+    # fi
+
+    # export VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME
 
     for i in {1..5}; do # try 5 times
       yarn --cwd build --frozen-lockfile --check-files && break