Skip to content

Commit b4dd4d5

Browse files
authored
ci: switch to bionic agents for arm64 and armhf clients (microsoft#184906)
* ci: switch to bionic agents for arm64 and armhf clients * ci: invalidate cache * ci: fix docker client installation * chore: update debian dependencies * chore: update rpm dependencies
1 parent b0bcc33 commit b4dd4d5

File tree

7 files changed

+15
-29
lines changed

7 files changed

+15
-29
lines changed

build/.cachesalt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2023-03-31T12:39:03.753Z
1+
2023-06-12T12:55:48.130Z

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

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -86,16 +86,10 @@ steps:
8686
# TODO@joaomoreno TODO@deepak1556 this should be part of the base image
8787
- ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
8888
- script: |
89-
if [ "$VSCODE_ARCH" = "x64" ]; then
90-
OS=ubuntu
91-
else
92-
OS=debian
93-
fi
94-
9589
sudo apt-get update && sudo apt-get install -y ca-certificates curl gnupg
9690
sudo mkdir -m 0755 -p /etc/apt/keyrings
97-
curl -fsSL https://download.docker.com/linux/$OS/gpg | sudo gpg --dearmor -o /etc/apt/keyrings/docker.gpg
98-
echo "deb [arch="$(dpkg --print-architecture)" signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/$OS "$(. /etc/os-release && echo "$VERSION_CODENAME")" stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
91+
curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /etc/apt/keyrings/docker.gpg
92+
echo "deb [arch="$(dpkg --print-architecture)" signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu "$(. /etc/os-release && echo "$VERSION_CODENAME")" stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
9993
sudo apt update && sudo apt install -y docker-ce-cli
10094
displayName: Install Docker client
10195
condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))

build/azure-pipelines/product-build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,11 +144,11 @@ resources:
144144
endpoint: VSCodeHub
145145
options: --user 0:0 --cap-add SYS_ADMIN
146146
- container: vscode-arm64
147-
image: vscodehub.azurecr.io/vscode-linux-build-agent:buster-arm64
147+
image: vscodehub.azurecr.io/vscode-linux-build-agent:bionic-arm64
148148
endpoint: VSCodeHub
149149
options: --user 0:0 --cap-add SYS_ADMIN
150150
- container: vscode-armhf
151-
image: vscodehub.azurecr.io/vscode-linux-build-agent:buster-armhf
151+
image: vscodehub.azurecr.io/vscode-linux-build-agent:bionic-armhf
152152
endpoint: VSCodeHub
153153
options: --user 0:0 --cap-add SYS_ADMIN
154154
- container: snapcraft

build/linux/debian/dep-lists.js

Lines changed: 5 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build/linux/debian/dep-lists.ts

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,17 +63,18 @@ export const referenceGeneratedDepsByArch = {
6363
'libatk-bridge2.0-0 (>= 2.5.3)',
6464
'libatk1.0-0 (>= 2.2.0)',
6565
'libatspi2.0-0 (>= 2.9.90)',
66+
'libc6 (>= 2.15)',
6667
'libc6 (>= 2.17)',
67-
'libc6 (>= 2.28)',
6868
'libc6 (>= 2.4)',
69+
'libc6 (>= 2.8)',
6970
'libc6 (>= 2.9)',
7071
'libcairo2 (>= 1.6.0)',
7172
'libcurl3-gnutls | libcurl3-nss | libcurl4 | libcurl3',
7273
'libdbus-1-3 (>= 1.5.12)',
7374
'libdrm2 (>= 2.4.60)',
7475
'libexpat1 (>= 2.0.1)',
7576
'libgbm1 (>= 17.1.0~rc2)',
76-
'libglib2.0-0 (>= 2.16.0)',
77+
'libglib2.0-0 (>= 2.12.0)',
7778
'libglib2.0-0 (>= 2.39.4)',
7879
'libgtk-3-0 (>= 3.9.10)',
7980
'libgtk-3-0 (>= 3.9.10) | libgtk-4-1',
@@ -82,7 +83,6 @@ export const referenceGeneratedDepsByArch = {
8283
'libnss3 (>= 3.26)',
8384
'libpango-1.0-0 (>= 1.14.0)',
8485
'libsecret-1-0 (>= 0.18)',
85-
'libstdc++6 (>= 4.1.1)',
8686
'libstdc++6 (>= 5)',
8787
'libstdc++6 (>= 5.2)',
8888
'libstdc++6 (>= 6)',
@@ -105,14 +105,13 @@ export const referenceGeneratedDepsByArch = {
105105
'libatk1.0-0 (>= 2.2.0)',
106106
'libatspi2.0-0 (>= 2.9.90)',
107107
'libc6 (>= 2.17)',
108-
'libc6 (>= 2.28)',
109108
'libcairo2 (>= 1.6.0)',
110109
'libcurl3-gnutls | libcurl3-nss | libcurl4 | libcurl3',
111110
'libdbus-1-3 (>= 1.0.2)',
112111
'libdrm2 (>= 2.4.60)',
113112
'libexpat1 (>= 2.0.1)',
114113
'libgbm1 (>= 17.1.0~rc2)',
115-
'libglib2.0-0 (>= 2.16.0)',
114+
'libglib2.0-0 (>= 2.12.0)',
116115
'libglib2.0-0 (>= 2.39.4)',
117116
'libgtk-3-0 (>= 3.9.10)',
118117
'libgtk-3-0 (>= 3.9.10) | libgtk-4-1',
@@ -121,7 +120,6 @@ export const referenceGeneratedDepsByArch = {
121120
'libnss3 (>= 3.26)',
122121
'libpango-1.0-0 (>= 1.14.0)',
123122
'libsecret-1-0 (>= 0.18)',
124-
'libstdc++6 (>= 4.1.1)',
125123
'libstdc++6 (>= 5)',
126124
'libstdc++6 (>= 5.2)',
127125
'libstdc++6 (>= 6)',

0 commit comments

Comments
 (0)