From 2c782ef58df6a34c9d1946c64a9e21876a319920 Mon Sep 17 00:00:00 2001 From: Ed Morley <501702+edmorley@users.noreply.github.com> Date: Mon, 15 Jul 2024 16:02:40 +0100 Subject: [PATCH] Update CI to Ubuntu 24.04 runner images (#50) Now that Ubuntu 24.04 images are available on GitHub Actions, we can update from the Ubuntu 22.04 images. See also: https://github.com/actions/runner-images/issues/9848 https://github.com/actions/runner-images/blob/main/images/ubuntu/Ubuntu2404-Readme.md https://salesforce.quip.com/bu6UA0KImOxJ#temp:C:GZRd13d2ce2d455470495cbd34cf GUS-W-16238120. --- .github/workflows/build_jruby.yml | 2 +- .github/workflows/build_ruby.yml | 2 +- .github/workflows/ci.yml | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build_jruby.yml b/.github/workflows/build_jruby.yml index 9ee44d3..d3f7e4a 100644 --- a/.github/workflows/build_jruby.yml +++ b/.github/workflows/build_jruby.yml @@ -25,7 +25,7 @@ env: jobs: build-and-upload: - runs-on: pub-hk-ubuntu-22.04-xlarge + runs-on: pub-hk-ubuntu-24.04-xlarge strategy: fail-fast: false matrix: diff --git a/.github/workflows/build_ruby.yml b/.github/workflows/build_ruby.yml index e9a49bf..ffe6580 100644 --- a/.github/workflows/build_ruby.yml +++ b/.github/workflows/build_ruby.yml @@ -25,7 +25,7 @@ env: jobs: build_ruby: - runs-on: ${{ matrix.arch == 'arm64' && 'pub-hk-ubuntu-22.04-arm-xlarge' || 'pub-hk-ubuntu-22.04-xlarge' }} + runs-on: ${{ matrix.arch == 'arm64' && 'pub-hk-ubuntu-24.04-arm-xlarge' || 'pub-hk-ubuntu-24.04-xlarge' }} strategy: matrix: arch: ["amd64", "arm64"] diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fb92cc2..037c7ef 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -6,7 +6,7 @@ on: jobs: shellcheck: - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: - name: Checkout uses: actions/checkout@v4 @@ -14,7 +14,7 @@ jobs: run: shellcheck *.sh -x lint: - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: - name: Checkout uses: actions/checkout@v4 @@ -36,7 +36,7 @@ jobs: run: RUSTDOCFLAGS="-D warnings" cargo doc --all-features --document-private-items --no-deps unit-test: - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: - name: Checkout uses: actions/checkout@v4 @@ -48,7 +48,7 @@ jobs: run: cargo test --all-features ruby_integration_test: - runs-on: ${{ matrix.arch == 'arm64' && 'pub-hk-ubuntu-22.04-arm-medium' || 'ubuntu-latest' }} + runs-on: ${{ matrix.arch == 'arm64' && 'pub-hk-ubuntu-24.04-arm-medium' || 'ubuntu-24.04' }} strategy: matrix: base_image: ["heroku-20", "heroku-22", "heroku-24"] @@ -76,7 +76,7 @@ jobs: run: cargo run --bin ruby_check -- --version ${{matrix.version}} --base-image ${{matrix.base_image}} --arch ${{matrix.arch}} jruby_integration_test: - runs-on: ${{ matrix.arch == 'arm64' && 'pub-hk-ubuntu-22.04-arm-medium' || 'ubuntu-latest' }} + runs-on: ${{ matrix.arch == 'arm64' && 'pub-hk-ubuntu-24.04-arm-medium' || 'ubuntu-24.04' }} strategy: matrix: base_image: ["heroku-20", "heroku-22", "heroku-24"]