Skip to content

Commit 68870b2

Browse files
authored
Fix
1 parent 1f4840b commit 68870b2

File tree

1 file changed

+5
-24
lines changed

1 file changed

+5
-24
lines changed

.github/workflows/release.yml

Lines changed: 5 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,9 @@ jobs:
8181
libxkbfile-dev \
8282
libkrb5-dev \
8383
libgbm1 \
84-
rpm
84+
rpm \
85+
gcc-10 \
86+
g++-10
8587
sudo cp build/azure-pipelines/linux/xvfb.init /etc/init.d/xvfb
8688
sudo chmod +x /etc/init.d/xvfb
8789
sudo update-rc.d xvfb defaults
@@ -112,29 +114,6 @@ jobs:
112114
key: ${{ runner.os }}-npmCacheDir-${{ steps.nodeModulesCacheKey.outputs.value }}
113115
restore-keys: ${{ runner.os }}-npmCacheDir-
114116

115-
- name: Override gnu target for arm64 and arm
116-
working-directory: ./openvscode-server
117-
if: matrix.vscode_arch == 'arm64' || matrix.vscode_arch == 'armhf'
118-
run: |
119-
set -e
120-
includes=$(cat << 'EOF'
121-
{
122-
"target_defaults": {
123-
"conditions": [
124-
["OS=='linux'", {
125-
'cflags_cc!': [ '-std=gnu++20' ],
126-
'cflags_cc': [ '-std=gnu++2a' ],
127-
}]
128-
]
129-
}
130-
}
131-
EOF
132-
)
133-
if [ ! -d "$HOME/.gyp" ]; then
134-
mkdir -p "$HOME/.gyp"
135-
fi
136-
echo "$includes" > "$HOME/.gyp/include.gypi"
137-
138117
- name: Execute npm
139118
working-directory: ./openvscode-server
140119
if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
@@ -162,6 +141,8 @@ jobs:
162141
cd ..
163142
164143
export VSCODE_SYSROOT_PREFIX='-glibc-2.17'
144+
export CC=$(which gcc-10)
145+
export CXX=$(which g++-10)
165146
source ./build/azure-pipelines/linux/setup-env.sh --skip-sysroot
166147
167148
for i in {1..5}; do # try 5 times

0 commit comments

Comments
 (0)