From 689cf2e31f79e073db6cbdb59dd7b18a5fc59101 Mon Sep 17 00:00:00 2001 From: John Sirois Date: Fri, 15 Sep 2023 11:49:57 -0700 Subject: [PATCH] Update ubuntu-2(0->2).04 and macos-(11->12). This just gets ahead of deprecation removals by GH. --- .github/workflows/ci.yml | 8 ++++---- .github/workflows/release.yml | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fcbe0c6..012fa38 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,7 +15,7 @@ jobs: org-check: name: Check GitHub Organization if: github.repository_owner == 'a-scie' - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - name: Noop run: "true" @@ -25,7 +25,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-20.04, macos-11, macos-13-aarch64, windows-2022] + os: [ubuntu-22.04, macos-12, macos-13-aarch64, windows-2022] steps: - uses: actions/checkout@v3 - name: Check Formatting @@ -37,10 +37,10 @@ jobs: - name: Unit Tests run: cargo test --all - name: Build & Package - if: ${{ matrix.os != 'ubuntu-20.04' }} + if: ${{ matrix.os != 'ubuntu-22.04' }} run: cargo run -p package - name: Build & Package - if: ${{ matrix.os == 'ubuntu-20.04' }} + if: ${{ matrix.os == 'ubuntu-22.04' }} run: | mkdir dist docker run --rm \ diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2e29e02..5ba6f7b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -12,14 +12,14 @@ jobs: org-check: name: Check GitHub Organization if: ${{ github.repository_owner == 'a-scie' }} - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - name: Noop run: "true" determine-tag: name: Determine the release tag to operate against. needs: org-check - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 outputs: release-tag: ${{ steps.determine-tag.outputs.release-tag }} release-version: ${{ steps.determine-tag.outputs.release-version }} @@ -45,7 +45,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ ubuntu-20.04, macos-11, macos-13-aarch64, windows-2022 ] + os: [ ubuntu-22.04, macos-12, macos-13-aarch64, windows-2022 ] environment: Release steps: - name: Checkout scie-jump ${{ needs.determine-tag.outputs.release-tag }} @@ -53,10 +53,10 @@ jobs: with: ref: ${{ needs.determine-tag.outputs.release-tag }} - name: Package scie-jump ${{ needs.determine-tag.outputs.release-tag }} binary - if: ${{ matrix.os != 'ubuntu-20.04' }} + if: ${{ matrix.os != 'ubuntu-22.04' }} run: cargo run -p package -- dist - name: Package scie-jump ${{ needs.determine-tag.outputs.release-tag }} binary - if: ${{ matrix.os == 'ubuntu-20.04' }} + if: ${{ matrix.os == 'ubuntu-22.04' }} run: | mkdir dist docker run --rm \ @@ -89,7 +89,7 @@ jobs: needs: - determine-tag - github-release - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - name: Trigger aarch64 release uses: CircleCI-Public/trigger-circleci-pipeline-action@v1.0.5