From 609838aebd17fa44c2532ca7c85ec3f9629e6ac6 Mon Sep 17 00:00:00 2001 From: LingMan Date: Thu, 29 Sep 2022 04:49:24 +0200 Subject: [PATCH] ci: use latest runner images in CI The `ubuntu-18.04` image is deprecated and will be removed by 2023-04-01[1][2] with scheduled brownouts starting on 2022-10-03. Update all images to the latest available versions. [1]: https://github.blog/changelog/2022-08-09-github-actions-the-ubuntu-18-04-actions-runner-image-is-being-deprecated-and-will-be-removed-by-12-1-22/ [2]: https://github.com/actions/runner-images/issues/6002 --- .github/workflows/ci.yml | 36 +++++++++++++++++------------------ .github/workflows/release.yml | 20 +++++++++---------- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 252698fc..65a307fa 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -42,31 +42,31 @@ jobs: - win-gnu include: - build: pinned - os: ubuntu-18.04 + os: ubuntu-22.04 rust: 1.52.1 - build: stable - os: ubuntu-18.04 + os: ubuntu-22.04 rust: stable - build: beta - os: ubuntu-18.04 + os: ubuntu-22.04 rust: beta - build: nightly - os: ubuntu-18.04 + os: ubuntu-22.04 rust: nightly - build: nightly-musl - os: ubuntu-18.04 + os: ubuntu-22.04 rust: nightly target: x86_64-unknown-linux-musl - build: nightly-32 - os: ubuntu-18.04 + os: ubuntu-22.04 rust: nightly target: i686-unknown-linux-gnu - build: nightly-mips - os: ubuntu-18.04 + os: ubuntu-22.04 rust: nightly target: mips64-unknown-linux-gnuabi64 - build: nightly-arm - os: ubuntu-18.04 + os: ubuntu-22.04 rust: nightly # For stripping release binaries: # docker run --rm -v $PWD/target:/target:Z \ @@ -75,25 +75,25 @@ jobs: # /target/arm-unknown-linux-gnueabihf/debug/rg target: arm-unknown-linux-gnueabihf - build: macos - os: macos-latest + os: macos-12 rust: nightly - build: win-msvc - os: windows-2019 + os: windows-2022 rust: nightly - build: win-gnu - os: windows-2019 + os: windows-2022 rust: nightly-x86_64-gnu steps: - name: Checkout repository uses: actions/checkout@v2 - name: Install packages (Ubuntu) - if: matrix.os == 'ubuntu-18.04' + if: matrix.os == 'ubuntu-22.04' run: | ci/ubuntu-install-packages - name: Install packages (macOS) - if: matrix.os == 'macos-latest' + if: matrix.os == 'macos-12' run: | ci/macos-install-packages @@ -148,14 +148,14 @@ jobs: run: ${{ env.CARGO }} test --verbose --workspace ${{ env.TARGET_FLAGS }} - name: Test for existence of build artifacts (Windows) - if: matrix.os == 'windows-2019' + if: matrix.os == 'windows-2022' shell: bash run: | outdir="$(ci/cargo-out-dir "${{ env.TARGET_DIR }}")" ls "$outdir/_rg.ps1" && file "$outdir/_rg.ps1" - name: Test for existence of build artifacts (Unix) - if: matrix.os != 'windows-2019' + if: matrix.os != 'windows-2022' shell: bash run: | outdir="$(ci/cargo-out-dir "${{ env.TARGET_DIR }}")" @@ -172,13 +172,13 @@ jobs: # 'rg' binary (done in test-complete) with qemu, which is a pain and # doesn't really gain us much. If shell completion works in one place, # it probably works everywhere. - if: matrix.target == '' && matrix.os != 'windows-2019' + if: matrix.target == '' && matrix.os != 'windows-2022' shell: bash run: ci/test-complete rustfmt: name: rustfmt - runs-on: ubuntu-18.04 + runs-on: ubuntu-22.04 steps: - name: Checkout repository uses: actions/checkout@v2 @@ -193,7 +193,7 @@ jobs: docs: name: Docs - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - name: Checkout repository uses: actions/checkout@v2 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c8776d5a..4c81cd1c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -24,7 +24,7 @@ on: jobs: create-release: name: create-release - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 # env: # Set to force version number, e.g., when no tag exists. # RG_VERSION: TEST-0.0.0 @@ -71,27 +71,27 @@ jobs: build: [linux, linux-arm, macos, win-msvc, win-gnu, win32-msvc] include: - build: linux - os: ubuntu-18.04 + os: ubuntu-22.04 rust: nightly target: x86_64-unknown-linux-musl - build: linux-arm - os: ubuntu-18.04 + os: ubuntu-22.04 rust: nightly target: arm-unknown-linux-gnueabihf - build: macos - os: macos-latest + os: macos-12 rust: nightly target: x86_64-apple-darwin - build: win-msvc - os: windows-2019 + os: windows-2022 rust: nightly target: x86_64-pc-windows-msvc - build: win-gnu - os: windows-2019 + os: windows-2022 rust: nightly-x86_64-gnu target: x86_64-pc-windows-gnu - build: win32-msvc - os: windows-2019 + os: windows-2022 rust: nightly target: i686-pc-windows-msvc @@ -102,12 +102,12 @@ jobs: fetch-depth: 1 - name: Install packages (Ubuntu) - if: matrix.os == 'ubuntu-18.04' + if: matrix.os == 'ubuntu-22.04' run: | ci/ubuntu-install-packages - name: Install packages (macOS) - if: matrix.os == 'macos-latest' + if: matrix.os == 'macos-12' run: | ci/macos-install-packages @@ -159,7 +159,7 @@ jobs: cp "$outdir"/{rg.bash,rg.fish,_rg.ps1} "$staging/complete/" cp complete/_rg "$staging/complete/" - if [ "${{ matrix.os }}" = "windows-2019" ]; then + if [ "${{ matrix.os }}" = "windows-2022" ]; then cp "target/${{ matrix.target }}/release/rg.exe" "$staging/" 7z a "$staging.zip" "$staging" echo "ASSET=$staging.zip" >> $GITHUB_ENV