Skip to content

Commit b110891

Browse files
Update GitHub actions runners to ubuntu-22.04 (#837)
1 parent 84644fc commit b110891

File tree

1 file changed

+7
-35
lines changed

1 file changed

+7
-35
lines changed

.github/workflows/build.yml

Lines changed: 7 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -16,44 +16,16 @@ env:
1616

1717
jobs:
1818
base:
19-
# `unbuntu-20.04-8core` for arch amd64 non-scheduled builds
20-
# `unbuntu-20.04` for arch amd64 scheduled builds
21-
# `unbuntu-20.04-8core-arm` for arch arm64 non-scheduled builds
22-
# `unbuntu-20.04-2core-arm` for arch arm64 scheduled builds
23-
runs-on: ubuntu-20.04${{ ((github.event_name != 'schedule') && '-8core') || (( matrix.arch == 'arm64' && '-2core' ) || '') }}${{ (matrix.arch == 'arm64') && '-arm' || '' }}
19+
# `unbuntu-22.04-8core` for arch amd64 non-scheduled builds
20+
# `unbuntu-22.04` for arch amd64 scheduled builds
21+
# `unbuntu-22.04-8core-arm` for arch arm64 non-scheduled builds
22+
# `unbuntu-22.04-2core-arm` for arch arm64 scheduled builds
23+
runs-on: ubuntu-22.04${{ ((github.event_name != 'schedule') && '-8core') || (( matrix.arch == 'arm64' && '-2core' ) || '') }}${{ (matrix.arch == 'arm64') && '-arm' || '' }}
2424
strategy:
2525
matrix:
2626
arch: [amd64, arm64]
2727
timeout-minutes: ${{ (github.event_name != 'schedule' && 30) || ((matrix.arch == 'arm64' && 60) || 30) }}
2828
steps:
29-
- name: Install Docker
30-
if: ${{ matrix.arch == 'arm64' }}
31-
run: |
32-
# Add Docker's official GPG key:
33-
sudo apt-get update
34-
sudo apt-get install ca-certificates curl
35-
sudo install -m 0755 -d /etc/apt/keyrings
36-
sudo curl -fsSL https://download.docker.com/linux/ubuntu/gpg -o /etc/apt/keyrings/docker.asc
37-
sudo chmod a+r /etc/apt/keyrings/docker.asc
38-
39-
# Add the repository to Apt sources:
40-
echo \
41-
"deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/ubuntu \
42-
$(. /etc/os-release && echo "$VERSION_CODENAME") stable" | \
43-
sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
44-
sudo apt-get update
45-
46-
# Install Docker
47-
sudo apt-get install -y docker-ce docker-ce-cli containerd.io docker-buildx-plugin
48-
49-
# Give the current user permission to run docker without sudo
50-
sudo usermod -aG docker $USER
51-
sudo apt-get install -y acl
52-
sudo setfacl --modify user:$USER:rw /var/run/docker.sock
53-
- name: Install Ruby
54-
if: ${{ matrix.arch == 'arm64' }}
55-
run: |
56-
sudo apt-get install -y ruby
5729
- uses: actions/checkout@v3
5830
with:
5931
fetch-depth: 1
@@ -106,7 +78,7 @@ jobs:
10678
docker tag discourse/base:release${{ steps.arch-helper.outputs.arch_postfix_dash }} discourse/base:aarch64
10779
docker push discourse/base:aarch64
10880
test:
109-
runs-on: ubuntu-20.04${{ ((github.event_name != 'schedule') && '-8core') || '' }}
81+
runs-on: ubuntu-22.04${{ ((github.event_name != 'schedule') && '-8core') || '' }}
11082
timeout-minutes: 30
11183
needs: base
11284
defaults:
@@ -147,7 +119,7 @@ jobs:
147119
docker push discourse/discourse_test:slim-browsers
148120
docker push discourse/discourse_test:release
149121
dev:
150-
runs-on: ubuntu-20.04${{ ((github.event_name != 'schedule') && '-8core') || '' }}
122+
runs-on: ubuntu-22.04${{ ((github.event_name != 'schedule') && '-8core') || '' }}
151123
timeout-minutes: 30
152124
needs: base
153125
steps:

0 commit comments

Comments
 (0)