Skip to content

Commit 722b407

Browse files
authored
Merge pull request #225 from cs50/update-arm-runner
Use Ubuntu 24.04 Runners
2 parents 6200520 + 0d4a25e commit 722b407

File tree

1 file changed

+7
-24
lines changed

1 file changed

+7
-24
lines changed

.github/workflows/main.yml

+7-24
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ on: push
22

33
jobs:
44
build-amd64:
5-
runs-on: ubuntu-latest-64-cores
5+
runs-on: ubuntu-2404-64-cores-amd
66
steps:
77
- name: Set up Docker Buildx
88
uses: docker/setup-buildx-action@v3
@@ -16,7 +16,7 @@ jobs:
1616
- name: Setup Python
1717
uses: actions/setup-python@v5
1818
with:
19-
python-version: '3.11'
19+
python-version: '3.12'
2020

2121
- name: Build for linux/amd64
2222
uses: docker/build-push-action@v5
@@ -42,26 +42,8 @@ jobs:
4242
docker push cs50/cli:canary-amd64
4343
4444
build-arm64:
45-
runs-on: ubuntu-latest-64-cores-arm
45+
runs-on: ubuntu-2404-64-cores-arm
4646
steps:
47-
- name: Install Docker (remove once Docker is pre-installed on arm64 runners)
48-
run: |
49-
export DEBIAN_FRONTEND=noninteractive
50-
sudo apt update
51-
sudo apt install -y ca-certificates curl
52-
sudo install -m 0755 -d /etc/apt/keyrings
53-
sudo curl -fsSL https://download.docker.com/linux/ubuntu/gpg -o /etc/apt/keyrings/docker.asc
54-
sudo chmod a+r /etc/apt/keyrings/docker.asc
55-
echo \
56-
"deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/ubuntu \
57-
$(. /etc/os-release && echo "$VERSION_CODENAME") stable" | \
58-
sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
59-
sudo apt update
60-
sudo apt install -y docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin
61-
sudo usermod -aG docker $USER
62-
sudo apt install -y acl
63-
sudo setfacl --modify user:$USER:rw /var/run/docker.sock
64-
6547
- name: Set up Docker Buildx
6648
uses: docker/setup-buildx-action@v3
6749

@@ -71,9 +53,10 @@ jobs:
7153
username: ${{ secrets.DOCKERHUB_USERNAME }}
7254
password: ${{ secrets.DOCKERHUB_TOKEN }}
7355

74-
- name: Install Python (replace with setup-python once available on arm64 runners)
75-
run: |
76-
sudo apt install -y python3
56+
- name: Setup Python
57+
uses: actions/setup-python@v5
58+
with:
59+
python-version: '3.12'
7760

7861
- name: Build for linux/arm64
7962
uses: docker/build-push-action@v5

0 commit comments

Comments
 (0)