Skip to content

Commit 5ece69f

Browse files
authored
ci: fix flaky client module installation in legacy stage (microsoft#235786)
1 parent 75e8699 commit 5ece69f

File tree

2 files changed

+6
-24
lines changed

2 files changed

+6
-24
lines changed

build/.cachesalt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2024-09-04T10:21:29.952Z
1+
2024-12-11T00:28:56.838Z

build/azure-pipelines/linux/product-build-linux-legacy-server.yml

+5-23
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,9 @@ steps:
4242
libxkbfile-dev \
4343
libkrb5-dev \
4444
libgbm1 \
45-
rpm
45+
rpm \
46+
gcc-10 \
47+
g++-10
4648
sudo cp build/azure-pipelines/linux/xvfb.init /etc/init.d/xvfb
4749
sudo chmod +x /etc/init.d/xvfb
4850
sudo update-rc.d xvfb defaults
@@ -83,28 +85,6 @@ steps:
8385
imageName: vscode-linux-build-agent:centos7-devtoolset8-$(VSCODE_ARCH)
8486
containerCommand: uname
8587

86-
- ${{ if or(eq(parameters.VSCODE_ARCH, 'arm64'), eq(parameters.VSCODE_ARCH, 'armhf')) }}:
87-
- script: |
88-
set -e
89-
includes=$(cat << 'EOF'
90-
{
91-
"target_defaults": {
92-
"conditions": [
93-
["OS=='linux'", {
94-
'cflags_cc!': [ '-std=gnu++20' ],
95-
'cflags_cc': [ '-std=gnu++2a' ],
96-
}]
97-
]
98-
}
99-
}
100-
EOF
101-
)
102-
if [ ! -d "$HOME/.gyp" ]; then
103-
mkdir -p "$HOME/.gyp"
104-
fi
105-
echo "$includes" > "$HOME/.gyp/include.gypi"
106-
displayName: Override gnu target for arm64 and arm
107-
10888
- script: |
10989
set -e
11090
@@ -123,6 +103,8 @@ steps:
123103
set -e
124104
125105
export VSCODE_SYSROOT_PREFIX='-glibc-2.17'
106+
export CC=$(which gcc-10)
107+
export CXX=$(which g++-10)
126108
source ./build/azure-pipelines/linux/setup-env.sh --skip-sysroot
127109
128110
for i in {1..5}; do # try 5 times

0 commit comments

Comments
 (0)