Skip to content

Commit

Permalink
macOS CI fixes (wheremyfoodat#587)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
shinra-electric committed Aug 27, 2024
1 parent 2754df9 commit 1674ad5
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/MacOS_Build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
Expand All @@ -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'
6 changes: 3 additions & 3 deletions .github/workflows/Qt_Build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
Expand All @@ -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'
Expand Down

0 comments on commit 1674ad5

Please # to comment.