From a05b03068deeccfb23a1c049d08f8408b34ce950 Mon Sep 17 00:00:00 2001 From: Thiago Mendes Date: Thu, 1 Feb 2024 11:27:47 +0100 Subject: [PATCH] ci: use macos arm64 runners make usage of the new arm64 macOS GitHub actions runners Signed-off-by: Thiago Mendes --- .github/workflows/next-build.yaml | 6 +++--- .github/workflows/pr-check.yaml | 4 ++-- .github/workflows/publish-to-brew.yaml | 2 +- .github/workflows/release.yaml | 8 ++++---- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/next-build.yaml b/.github/workflows/next-build.yaml index f7060c3187e..ec2862e4d1b 100644 --- a/.github/workflows/next-build.yaml +++ b/.github/workflows/next-build.yaml @@ -75,7 +75,7 @@ jobs: strategy: fail-fast: false matrix: - os: [windows-2022, ubuntu-22.04, macos-12] + os: [windows-2022, ubuntu-22.04, macos-14] timeout-minutes: 60 steps: - uses: actions/checkout@v4 @@ -95,7 +95,7 @@ jobs: run: echo "dir=$(yarn cache dir)" >> ${env:GITHUB_OUTPUT} - name: Get yarn cache directory path (mac/Linux) - if: ${{ matrix.os=='ubuntu-22.04' || matrix.os=='macos-12' }} + if: ${{ matrix.os=='ubuntu-22.04' || matrix.os=='macos-14' }} id: yarn-cache-dir-path-unix run: echo "dir=$(yarn cache dir)" >> ${GITHUB_OUTPUT} @@ -109,7 +109,7 @@ jobs: ${{ runner.os }}-yarn- - uses: actions/cache@v4 - if: ${{ matrix.os=='ubuntu-22.04' || matrix.os=='macos-12' }} + if: ${{ matrix.os=='ubuntu-22.04' || matrix.os=='macos-14' }} id: yarn-cache-unix with: path: ${{ steps.yarn-cache-dir-path-unix.outputs.dir }} diff --git a/.github/workflows/pr-check.yaml b/.github/workflows/pr-check.yaml index aec2f6e5697..b0a20178165 100644 --- a/.github/workflows/pr-check.yaml +++ b/.github/workflows/pr-check.yaml @@ -137,7 +137,7 @@ jobs: darwin: name: macOS - runs-on: macos-12 + runs-on: macos-14 timeout-minutes: 40 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -302,4 +302,4 @@ jobs: if: always() with: name: smoke-e2e-tests - path: ./tests/output/ \ No newline at end of file + path: ./tests/output/ diff --git a/.github/workflows/publish-to-brew.yaml b/.github/workflows/publish-to-brew.yaml index 18e95694d6c..abd892e064a 100644 --- a/.github/workflows/publish-to-brew.yaml +++ b/.github/workflows/publish-to-brew.yaml @@ -30,7 +30,7 @@ jobs: publish-to-brew: name: Publish Podman Desktop to Brew cask - runs-on: macos-12 + runs-on: macos-14 steps: - name: Set version id: VERSION diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index b2908cfd803..90e36001b33 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -128,8 +128,8 @@ jobs: - os: "windows-2022" - os: "windows-2022" airgap: "true" - - os: "macos-12" - - os: "macos-12" + - os: "macos-14" + - os: "macos-14" airgap: "true" - os: "ubuntu-22.04" timeout-minutes: 60 @@ -153,7 +153,7 @@ jobs: run: echo "dir=$(yarn cache dir)" >> ${env:GITHUB_OUTPUT} - name: Get yarn cache directory path (mac/Linux) - if: ${{ matrix.os=='ubuntu-22.04' || matrix.os=='macos-12' }} + if: ${{ matrix.os=='ubuntu-22.04' || matrix.os=='macos-14' }} id: yarn-cache-dir-path-unix run: echo "dir=$(yarn cache dir)" >> ${GITHUB_OUTPUT} @@ -167,7 +167,7 @@ jobs: ${{ runner.os }}-yarn- - uses: actions/cache@v4 - if: ${{ matrix.os=='ubuntu-22.04' || matrix.os=='macos-12' }} + if: ${{ matrix.os=='ubuntu-22.04' || matrix.os=='macos-14' }} id: yarn-cache-unix with: path: ${{ steps.yarn-cache-dir-path-unix.outputs.dir }}