From e6f7140f05c033ecc6b30b833504f76713e5afa2 Mon Sep 17 00:00:00 2001 From: Lars Francke Date: Fri, 24 Jan 2025 23:18:47 +0100 Subject: [PATCH 1/2] Move from BuildJet to GitHub ARM runners --- .github/actionlint.yaml | 6 ------ .github/workflows/pr_stackablectl.yml | 2 +- .github/workflows/release_stackablectl.yml | 2 +- 3 files changed, 2 insertions(+), 8 deletions(-) delete mode 100644 .github/actionlint.yaml diff --git a/.github/actionlint.yaml b/.github/actionlint.yaml deleted file mode 100644 index aa2d2b97..00000000 --- a/.github/actionlint.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- -self-hosted-runner: - # BuildJet machines we are using - labels: - - buildjet-2vcpu-ubuntu-2204-arm - - buildjet-4vcpu-ubuntu-2204-arm diff --git a/.github/workflows/pr_stackablectl.yml b/.github/workflows/pr_stackablectl.yml index d3e116fd..bc173c31 100644 --- a/.github/workflows/pr_stackablectl.yml +++ b/.github/workflows/pr_stackablectl.yml @@ -40,7 +40,7 @@ jobs: - target: x86_64-unknown-linux-gnu os: ubuntu-latest - target: aarch64-unknown-linux-gnu - os: buildjet-4vcpu-ubuntu-2204-arm + os: ubuntu-22.04-arm - target: x86_64-apple-darwin os: macos-latest - target: aarch64-apple-darwin diff --git a/.github/workflows/release_stackablectl.yml b/.github/workflows/release_stackablectl.yml index 33c061f5..d0da9cef 100644 --- a/.github/workflows/release_stackablectl.yml +++ b/.github/workflows/release_stackablectl.yml @@ -27,7 +27,7 @@ jobs: os: ubuntu-20.04 # We don't use ubuntu-latest because we want to build against an old glibc version. (18.04 has glibc 2.27, 20.04 has glibc 2.31, 22.04 has glibc 2.35) file-suffix: "" - target: aarch64-unknown-linux-gnu - os: buildjet-4vcpu-ubuntu-2204-arm # The ARM runners only support Ubuntu 22.04, so we can't pick 20.04 + os: ubuntu-22.04-arm # 2025-01: The ARM runners only support Ubuntu 22.04 or 24.04, so we can't pick 20.04: file-suffix: "" - target: x86_64-apple-darwin os: macos-latest From 95358f95e92eeb31aa0b960525cd959a1feae115 Mon Sep 17 00:00:00 2001 From: Lars Francke Date: Sat, 25 Jan 2025 00:08:19 +0100 Subject: [PATCH 2/2] Update to actionlint 1.7.7 to get new GitHub ARM image names --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 01fafc2a..51d94924 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -43,7 +43,7 @@ repos: exclude: '^extra/completions/' - repo: https://github.com/rhysd/actionlint - rev: 62dc61a45fc95efe8c800af7a557ab0b9165d63b # 1.7.1 + rev: 03d0035246f3e81f36aed592ffb4bebf33a03106 # 1.7.7 hooks: - id: actionlint