From e65febca09c77129d5e45fcf90886437e69f0441 Mon Sep 17 00:00:00 2001
From: Robo <hop2deep@gmail.com>
Date: Fri, 17 May 2024 00:18:57 +0900
Subject: [PATCH] ci: use sysroots for oss linux pipeline (#212895)

* ci: use sysroots for oss linux pipeline

* ci: update cache

* ci: cleanup conditions
---
 build/.cachesalt                              |  2 +-
 .../linux/product-build-linux.yml             | 97 ++++++++-----------
 2 files changed, 43 insertions(+), 56 deletions(-)

diff --git a/build/.cachesalt b/build/.cachesalt
index 8148922f086..a454f1220da 100644
--- a/build/.cachesalt
+++ b/build/.cachesalt
@@ -1 +1 @@
-2024-05-16T08:47:22.277Z
+2024-05-16T14:24:05.381Z
diff --git a/build/azure-pipelines/linux/product-build-linux.yml b/build/azure-pipelines/linux/product-build-linux.yml
index cdc687fe7ac..352b31360f8 100644
--- a/build/azure-pipelines/linux/product-build-linux.yml
+++ b/build/azure-pipelines/linux/product-build-linux.yml
@@ -100,50 +100,48 @@ steps:
     condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), ne(variables['NPM_REGISTRY'], 'none'))
     displayName: Setup NPM Authentication
 
+  - script: |
+      set -e
+
+      for i in {1..5}; do # try 5 times
+        yarn --cwd build --frozen-lockfile --check-files && break
+        if [ $i -eq 3 ]; then
+          echo "Yarn failed too many times" >&2
+          exit 1
+        fi
+        echo "Yarn failed $i, trying again..."
+      done
+
+      source ./build/azure-pipelines/linux/setup-env.sh
+
+      for i in {1..5}; do # try 5 times
+        yarn --frozen-lockfile --check-files && break
+        if [ $i -eq 3 ]; then
+          echo "Yarn failed too many times" >&2
+          exit 1
+        fi
+        echo "Yarn failed $i, trying again..."
+      done
+    env:
+      npm_config_arch: $(NPM_ARCH)
+      VSCODE_ARCH: $(VSCODE_ARCH)
+      ELECTRON_SKIP_BINARY_DOWNLOAD: 1
+      PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
+      GITHUB_TOKEN: "$(github-distro-mixin-password)"
+    displayName: Install dependencies
+    condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
+
+  - script: |
+      set -e
+
+      EXPECTED_GLIBC_VERSION="2.28" \
+      EXPECTED_GLIBCXX_VERSION="3.4.25" \
+      ./build/azure-pipelines/linux/verify-glibc-requirements.sh
+    condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
+    displayName: Check GLIBC and GLIBCXX dependencies in remote/node_modules
+
+
   - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
-    - script: |
-        set -e
-        # To workaround the issue of yarn not respecting the registry value from .npmrc
-        yarn config set registry "$NPM_REGISTRY"
-
-        for i in {1..5}; do # try 5 times
-          yarn --cwd build --frozen-lockfile --check-files && break
-          if [ $i -eq 3 ]; then
-            echo "Yarn failed too many times" >&2
-            exit 1
-          fi
-          echo "Yarn failed $i, trying again..."
-        done
-
-        source ./build/azure-pipelines/linux/setup-env.sh
-
-        for i in {1..5}; do # try 5 times
-          yarn --frozen-lockfile --check-files && break
-          if [ $i -eq 3 ]; then
-            echo "Yarn failed too many times" >&2
-            exit 1
-          fi
-          echo "Yarn failed $i, trying again..."
-        done
-      env:
-        npm_config_arch: $(NPM_ARCH)
-        VSCODE_ARCH: $(VSCODE_ARCH)
-        NPM_REGISTRY: "$(NPM_REGISTRY)"
-        ELECTRON_SKIP_BINARY_DOWNLOAD: 1
-        PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
-        GITHUB_TOKEN: "$(github-distro-mixin-password)"
-      displayName: Install dependencies (non-OSS)
-      condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
-
-    - script: |
-        set -e
-
-        EXPECTED_GLIBC_VERSION="2.28" \
-        EXPECTED_GLIBCXX_VERSION="3.4.25" \
-        ./build/azure-pipelines/linux/verify-glibc-requirements.sh
-      condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
-      displayName: Check GLIBC and GLIBCXX dependencies in remote/node_modules
-
     - script: node build/azure-pipelines/distro/mixin-npm
       condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
       displayName: Mixin distro node modules
@@ -154,23 +152,12 @@ steps:
     - script: |
         set -e
 
-        for i in {1..5}; do # try 5 times
-          yarn --frozen-lockfile --check-files && break
-          if [ $i -eq 3 ]; then
-            echo "Yarn failed too many times" >&2
-            exit 1
-          fi
-          echo "Yarn failed $i, trying again..."
-        done
-
         cd node_modules/native-keymap && npx node-gyp@9.4.0 -y rebuild --debug
         cd ../.. && ./.github/workflows/check-clean-git-state.sh
       env:
         npm_config_arch: $(NPM_ARCH)
-        ELECTRON_SKIP_BINARY_DOWNLOAD: 1
-        PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
         GITHUB_TOKEN: "$(github-distro-mixin-password)"
-      displayName: Install dependencies (OSS)
+      displayName: Rebuild debug version of native modules (OSS)
       condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
 
   - script: |