From ccf3a80426745451bd40a1146bfe9febe78e71bb Mon Sep 17 00:00:00 2001 From: "Sean T. Allen" Date: Sat, 27 Apr 2024 02:52:39 +0000 Subject: [PATCH] Update cross-aarch64 builder to Ubuntu 24.04 --- .ci-dockerfiles/cross-aarch64/Dockerfile | 2 +- .github/workflows/pr.yml | 2 +- .github/workflows/stress-test-runtime.yml | 16 ++++++++-------- .github/workflows/update-lib-cache.yml | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.ci-dockerfiles/cross-aarch64/Dockerfile b/.ci-dockerfiles/cross-aarch64/Dockerfile index 8f3974f600..bf269ce8e9 100644 --- a/.ci-dockerfiles/cross-aarch64/Dockerfile +++ b/.ci-dockerfiles/cross-aarch64/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/ponylang/ponyc-ci-x86-64-unknown-linux-ubuntu20.04-builder:20230830 +FROM ghcr.io/ponylang/ponyc-ci-x86-64-unknown-linux-ubuntu24.04-builder:20240425 ARG CROSS_TRIPLE=aarch64-unknown-linux-gnu ARG CROSS_CC=aarch64-linux-gnu-gcc diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index d8e796a68c..098bcacc0f 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -283,7 +283,7 @@ jobs: fail-fast: false matrix: include: - - image: ghcr.io/ponylang/ponyc-ci-cross-aarch64:20230830 + - image: ghcr.io/ponylang/ponyc-ci-cross-aarch64:20240427 name: aarch64 Linux glibc name: ${{ matrix.name }} diff --git a/.github/workflows/stress-test-runtime.yml b/.github/workflows/stress-test-runtime.yml index 1c3e106be9..d688be47b9 100644 --- a/.github/workflows/stress-test-runtime.yml +++ b/.github/workflows/stress-test-runtime.yml @@ -95,17 +95,17 @@ jobs: include: # these don't currently use a debugger as cross compilation hasn't # been set up to do 'run in debugger' - - image: ghcr.io/ponylang/ponyc-ci-cross-aarch64:20230830 - name: aarch64-unknown-linux-ubuntu20.04 [release] + - image: ghcr.io/ponylang/ponyc-ci-cross-aarch64:20240427 + name: aarch64-unknown-linux-ubuntu24.04 [release] target: test-cross-stress-release - - image: ghcr.io/ponylang/ponyc-ci-cross-aarch64:20230830 - name: aarch64-unknown-linux-ubuntu20.04 [debug] + - image: ghcr.io/ponylang/ponyc-ci-cross-aarch64:20240427 + name: aarch64-unknown-linux-ubuntu24.04 [debug] target: test-cross-stress-debug - - image: ghcr.io/ponylang/ponyc-ci-cross-aarch64:20230830 - name: aarch64-unknown-linux-ubuntu20.04 [cd] [release] + - image: ghcr.io/ponylang/ponyc-ci-cross-aarch64:20240427 + name: aarch64-unknown-linux-ubuntu24.04 [cd] [release] target: test-cross-stress-with-cd-release - - image: ghcr.io/ponylang/ponyc-ci-cross-aarch64:20230830 - name: aarch64-unknown-linux-ubuntu20.04 [cd] [debug] + - image: ghcr.io/ponylang/ponyc-ci-cross-aarch64:20240427 + name: aarch64-unknown-linux-ubuntu24.04 [cd] [debug] target: test-cross-stress-with-cd-debug name: ${{ matrix.name }} diff --git a/.github/workflows/update-lib-cache.yml b/.github/workflows/update-lib-cache.yml index e34e05dcfa..5a12bcf3b0 100644 --- a/.github/workflows/update-lib-cache.yml +++ b/.github/workflows/update-lib-cache.yml @@ -24,7 +24,7 @@ jobs: - image: ghcr.io/ponylang/ponyc-ci-cross-riscv64:20230830 - image: ghcr.io/ponylang/ponyc-ci-cross-arm:20230830 - image: ghcr.io/ponylang/ponyc-ci-cross-armhf:20230830 - - image: ghcr.io/ponylang/ponyc-ci-cross-aarch64:20230830 + - image: ghcr.io/ponylang/ponyc-ci-cross-aarch64:20240427 name: ${{ matrix.image }} container: