From 1674ad5a2c50c78e02fe366c7bd7c660cd3cef8e Mon Sep 17 00:00:00 2001
From: shinra-electric <50119606+shinra-electric@users.noreply.github.com>
Date: Tue, 27 Aug 2024 11:36:41 +0100
Subject: [PATCH] macOS CI fixes (#587)
* Update checkout to v4
* Update upload-artifact to v4
* don't try to reinstall python
* Update to v4 in Qt_Build.yml too
* remove python re-install in Qt_Build.yml too
---
.github/workflows/MacOS_Build.yml | 6 +++---
.github/workflows/Qt_Build.yml | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/.github/workflows/MacOS_Build.yml b/.github/workflows/MacOS_Build.yml
index 912c8568..76b75bd4 100644
--- a/.github/workflows/MacOS_Build.yml
+++ b/.github/workflows/MacOS_Build.yml
@@ -19,7 +19,7 @@ jobs:
runs-on: macos-13
steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v4
- name: Fetch submodules
run: git submodule update --init --recursive
@@ -40,7 +40,7 @@ jobs:
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
- name: Install bundle dependencies
- run: brew install --overwrite python@3.12 && brew install dylibbundler imagemagick
+ run: brew install dylibbundler imagemagick
- name: Run bundle script
run: ./.github/mac-bundle.sh
@@ -52,7 +52,7 @@ jobs:
run: zip -r Alber Alber.app
- name: Upload MacOS App
- uses: actions/upload-artifact@v2
+ uses: actions/upload-artifact@v4
with:
name: MacOS Alber App Bundle
path: 'Alber.zip'
diff --git a/.github/workflows/Qt_Build.yml b/.github/workflows/Qt_Build.yml
index 40141fb1..4485cc1c 100644
--- a/.github/workflows/Qt_Build.yml
+++ b/.github/workflows/Qt_Build.yml
@@ -54,7 +54,7 @@ jobs:
runs-on: macos-13
steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v4
- name: Fetch submodules
run: git submodule update --init --recursive
@@ -67,7 +67,7 @@ jobs:
- name: Install bundle dependencies
run: |
- brew install --overwrite python@3.12 && brew install dylibbundler imagemagick
+ brew install dylibbundler imagemagick
- name: Install qt
run: brew install qt && which macdeployqt
@@ -90,7 +90,7 @@ jobs:
run: zip -r Alber Alber.app
- name: Upload MacOS App
- uses: actions/upload-artifact@v2
+ uses: actions/upload-artifact@v4
with:
name: MacOS Alber App Bundle
path: 'Alber.zip'