Merge branch 'master' into qt6

* master: Update Github Actions workflow for MacOS builds
openemv · Dec 9, 2023 · bb75808 · bb75808
2 parents 8267a4b + cf6f56c
commit bb75808
Showing 1 changed file with 9 additions and 10 deletions.
diff --git a/.github/workflows/macos-build.yaml b/.github/workflows/macos-build.yaml
@@ -18,13 +18,13 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - { name: "MacOS 11", os: macos-11, osx_arch: "x86_64;arm64", build_type: "Release", deps: "none", fetch_deps: YES, build_dukpt_ui: NO }
-          - { name: "MacOS 11", os: macos-11, osx_arch: "x86_64;arm64", build_type: "Debug", deps: "tr31", fetch_deps: YES, build_dukpt_ui: NO }
-          - { name: "MacOS 11", os: macos-11, osx_arch: "x86_64", build_type: "Debug", deps: "tr31/qt5", fetch_deps: NO, build_dukpt_ui: YES }
-          - { name: "MacOS 11", os: macos-11, osx_arch: "x86_64", build_type: "Release", deps: "tr31/qt6", fetch_deps: NO, build_dukpt_ui: YES }
-          - { name: "MacOS 12", os: macos-12, osx_arch: "x86_64", build_type: "Release", deps: "tr31", fetch_deps: NO, build_dukpt_ui: NO }
-          - { name: "MacOS 12", os: macos-12, osx_arch: "x86_64", build_type: "Debug", deps: "tr31/qt5", fetch_deps: YES, build_dukpt_ui: YES }
-          - { name: "MacOS 12", os: macos-12, osx_arch: "x86_64", build_type: "Debug", deps: "tr31/qt6", fetch_deps: YES, build_dukpt_ui: YES }
+          - { name: "MacOS 12", os: macos-12, osx_arch: "x86_64;arm64", build_type: "Release", deps: "none", fetch_deps: YES, build_dukpt_ui: NO }
+          - { name: "MacOS 12", os: macos-12, osx_arch: "x86_64;arm64", build_type: "Debug", deps: "tr31", fetch_deps: YES, build_dukpt_ui: NO }
+          - { name: "MacOS 12", os: macos-12, osx_arch: "x86_64", build_type: "Debug", deps: "tr31/qt5", fetch_deps: NO, build_dukpt_ui: YES }
+          - { name: "MacOS 12", os: macos-12, osx_arch: "x86_64", build_type: "Release", deps: "tr31/qt6", fetch_deps: NO, build_dukpt_ui: YES }
+          - { name: "MacOS 13", os: macos-13, osx_arch: "x86_64", build_type: "Release", deps: "tr31", fetch_deps: NO, build_dukpt_ui: NO }
+          - { name: "MacOS 13", os: macos-13, osx_arch: "x86_64", build_type: "Debug", deps: "tr31/qt5", fetch_deps: YES, build_dukpt_ui: YES }
+          - { name: "MacOS 13", os: macos-13, osx_arch: "x86_64", build_type: "Debug", deps: "tr31/qt6", fetch_deps: YES, build_dukpt_ui: YES }
 
     name: ${{ matrix.name }} (${{ matrix.osx_arch }}) build (static/${{ matrix.build_type }}/${{ matrix.deps }})
     runs-on: ${{ matrix.os }}
@@ -88,13 +88,12 @@ jobs:
       run: ctest --test-dir build --output-on-failure
 
   build-macos-release:
-    name: MacOS 11 (release)
-    runs-on: macos-11
+    name: MacOS 12 (release)
+    runs-on: macos-12
 
     steps:
     - name: Install dependencies
       run: |
-        brew update
         brew install qt@5
         echo "QT_DIR=$(brew --prefix qt@5)/lib/cmake/Qt5" >> $GITHUB_ENV