From 6d694a6b68a4ddb7062a46ed0b8ee6e1c3ce8ec8 Mon Sep 17 00:00:00 2001
From: Florent Benoit <fbenoit@redhat.com>
Date: Mon, 12 Jun 2023 09:57:36 +0200
Subject: [PATCH] chore: use macOS 12 (current stable on GitHub actions)

Change-Id: Ia03a22e9c54c1738cdd9ba7b4f5c4edccc341b13

Signed-off-by: Florent Benoit <fbenoit@redhat.com>
---
 .github/workflows/next-build.yaml      |  6 +++---
 .github/workflows/pr-check.yaml        |  2 +-
 .github/workflows/publish-to-brew.yaml | 10 +++++-----
 .github/workflows/release.yaml         |  8 ++++----
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/next-build.yaml b/.github/workflows/next-build.yaml
index 7906eb7f154..c0f957d4e06 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-11]
+        os: [windows-2022, ubuntu-22.04, macos-12]
     timeout-minutes: 60
     steps:
       - uses: actions/checkout@v3
@@ -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-11' }}
+        if: ${{ matrix.os=='ubuntu-22.04' || matrix.os=='macos-12' }}
         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@v3
-        if: ${{ matrix.os=='ubuntu-22.04' || matrix.os=='macos-11' }}
+        if: ${{ matrix.os=='ubuntu-22.04' || matrix.os=='macos-12' }}
         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 b0fc08e1108..0e8899f9692 100644
--- a/.github/workflows/pr-check.yaml
+++ b/.github/workflows/pr-check.yaml
@@ -122,7 +122,7 @@ jobs:
 
   darwin:
     name: macOS
-    runs-on: macos-11
+    runs-on: macos-12
     timeout-minutes: 40
     env:
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/publish-to-brew.yaml b/.github/workflows/publish-to-brew.yaml
index 5e1175c1929..18e95694d6c 100644
--- a/.github/workflows/publish-to-brew.yaml
+++ b/.github/workflows/publish-to-brew.yaml
@@ -1,12 +1,12 @@
 #
 # Copyright (C) 2022 Red Hat, Inc.
-# 
+#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 # http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 # SPDX-License-Identifier: Apache-2.0
- 
+
 name: Publish update to Brew
 
 on:
@@ -30,7 +30,7 @@ jobs:
 
   publish-to-brew:
     name: Publish Podman Desktop to Brew cask
-    runs-on: macos-11
+    runs-on: macos-12
     steps:
       - name: Set version
         id: VERSION
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index b0bed5092db..0bcf7e3761c 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-11"
-          - os: "macos-11"
+          - os: "macos-12"
+          - os: "macos-12"
             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-11' }}
+        if: ${{ matrix.os=='ubuntu-22.04' || matrix.os=='macos-12' }}
         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@v3
-        if: ${{ matrix.os=='ubuntu-22.04' || matrix.os=='macos-11' }}
+        if: ${{ matrix.os=='ubuntu-22.04' || matrix.os=='macos-12' }}
         id: yarn-cache-unix
         with:
           path: ${{ steps.yarn-cache-dir-path-unix.outputs.dir }}