From 662a74a140646e5077d9fcc373fa8713e44e9a2b Mon Sep 17 00:00:00 2001
From: Rongxin Liu <rongxinliu.dev@gmail.com>
Date: Mon, 28 Oct 2024 13:11:53 -0700
Subject: [PATCH 1/3] use updated arm64 runner
---
.github/workflows/main.yml | 27 +++++----------------------
1 file changed, 5 insertions(+), 22 deletions(-)
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index a57c645..e9160fb 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -42,26 +42,8 @@ jobs:
docker push cs50/cli:canary-amd64
build-arm64:
- runs-on: ubuntu-latest-64-cores-arm
+ runs-on: ubuntu-2404-64-cores-arm
steps:
- - name: Install Docker (remove once Docker is pre-installed on arm64 runners)
- run: |
- export DEBIAN_FRONTEND=noninteractive
- sudo apt update
- sudo apt install -y ca-certificates curl
- sudo install -m 0755 -d /etc/apt/keyrings
- sudo curl -fsSL https://download.docker.com/linux/ubuntu/gpg -o /etc/apt/keyrings/docker.asc
- sudo chmod a+r /etc/apt/keyrings/docker.asc
- echo \
- "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/ubuntu \
- $(. /etc/os-release && echo "$VERSION_CODENAME") stable" | \
- sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
- sudo apt update
- sudo apt install -y docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin
- sudo usermod -aG docker $USER
- sudo apt install -y acl
- sudo setfacl --modify user:$USER:rw /var/run/docker.sock
-
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
@@ -71,9 +53,10 @@ jobs:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- - name: Install Python (replace with setup-python once available on arm64 runners)
- run: |
- sudo apt install -y python3
+ - name: Setup Python
+ uses: actions/setup-python@v5
+ with:
+ python-version: '3.11'
- name: Build for linux/arm64
uses: docker/build-push-action@v5
From e781eb0496447ac7bdcae1e82036ee08ccc972ec Mon Sep 17 00:00:00 2001
From: Rongxin Liu <rongxinliu.dev@gmail.com>
Date: Mon, 28 Oct 2024 13:12:33 -0700
Subject: [PATCH 2/3] updated setup/python workflow to use python 3.12
---
.github/workflows/main.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index e9160fb..ae543d4 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -16,7 +16,7 @@ jobs:
- name: Setup Python
uses: actions/setup-python@v5
with:
- python-version: '3.11'
+ python-version: '3.12'
- name: Build for linux/amd64
uses: docker/build-push-action@v5
@@ -56,7 +56,7 @@ jobs:
- name: Setup Python
uses: actions/setup-python@v5
with:
- python-version: '3.11'
+ python-version: '3.12'
- name: Build for linux/arm64
uses: docker/build-push-action@v5
From 0d4a25ea0641911c8b1307a1134c75a65f77848a Mon Sep 17 00:00:00 2001
From: Rongxin Liu <rongxinliu.dev@gmail.com>
Date: Mon, 28 Oct 2024 13:21:18 -0700
Subject: [PATCH 3/3] use ubuntu 24.04 runners
---
.github/workflows/main.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index ae543d4..bd1f496 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -2,7 +2,7 @@ on: push
jobs:
build-amd64:
- runs-on: ubuntu-latest-64-cores
+ runs-on: ubuntu-2404-64-cores-amd
steps:
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3