From fc9589cd4ea207bcd571dbdec5585306e6cf4c88 Mon Sep 17 00:00:00 2001
From: Jean Pierre <jeanp413@hotmail.com>
Date: Tue, 12 Nov 2024 21:25:50 +0100
Subject: [PATCH] Fix release workflow

---
 .github/workflows/release.yml | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 1627ef2..25c5956 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -114,6 +114,30 @@ jobs:
           path: ${{ steps.npmCacheDirPath.outputs.dir }}
           key: ${{ runner.os }}-npmCacheDir-${{ steps.nodeModulesCacheKey.outputs.value }}
           restore-keys: ${{ runner.os }}-npmCacheDir-
+     
+      - name: Override gnu target for arm64 and arm
+        working-directory: ./openvscode-server
+        if: matrix.vscode_arch == 'arm64' || matrix.vscode_arch == 'armhf'
+        run: |
+          set -e
+          includes=$(cat << 'EOF'
+          {
+            "target_defaults": {
+              "conditions": [
+                ["OS=='linux'", {
+                  'cflags_cc!': [ '-std=gnu++20' ],
+                  'cflags_cc': [ '-std=gnu++2a' ],
+                }]
+              ]
+            }
+          }
+          EOF
+          )
+          if [ ! -d "$HOME/.gyp" ]; then
+            mkdir -p "$HOME/.gyp"
+          fi
+          echo "$includes" > "$HOME/.gyp/include.gypi"
+
       - name: Execute npm
         working-directory: ./openvscode-server
         if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
@@ -141,7 +165,7 @@ jobs:
           cd ..
 
           export VSCODE_SYSROOT_PREFIX='-glibc-2.17'
-          source ./build/azure-pipelines/linux/setup-env.sh --only-remote
+          source ./build/azure-pipelines/linux/setup-env.sh --skip-sysroot
 
           for i in {1..5}; do # try 5 times
             npm ci && break