From 3d882079075d7725d6c16049017149c4f2c0c531 Mon Sep 17 00:00:00 2001 From: Garrett Cox Date: Fri, 13 Mar 2026 11:09:47 -0500 Subject: Fix macOS CI (#243) * Fix macOS CI * fix switch * Fix readme links --- .github/workflows/mac.yml | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) (limited to '.github/workflows/mac.yml') diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml index f70c52e2..27a0a5ac 100644 --- a/.github/workflows/mac.yml +++ b/.github/workflows/mac.yml @@ -6,24 +6,18 @@ on: jobs: build: - runs-on: macOS-latest + runs-on: macOS-15 steps: - uses: actions/checkout@v4 with: submodules: recursive + - uses: actions/cache@v4 + with: + path: ~/Library/Caches/Homebrew + key: ${{ runner.os }}-${{ runner.arch }}-homebrew-${{ github.ref }}-${{ github.sha }} - name: Install dependencies - run: brew install sdl2 libpng glew ninja cmake libzip nlohmann-json tinyxml2 spdlog vorbis-tools + run: HOMEBREW_NO_AUTO_UPDATE=1 brew bundle --no-upgrade - name: Build run: | cmake -H. -Bbuild-cmake -GNinja -DCMAKE_BUILD_TYPE=Release - cmake --build build-cmake -j - - name: Create Package - run: | - mkdir starship-release - mv build-cmake/Starship starship-release/ - - name: Publish packaged artifacts - uses: actions/upload-artifact@v4 - with: - name: starship-mac-x64 - path: starship-release - retention-days: 1 \ No newline at end of file + cmake --build build-cmake -j \ No newline at end of file -- cgit v1.2.3 From 5050031c1e8b5be9e7061da8498a32c3c06c7436 Mon Sep 17 00:00:00 2001 From: Garrett Cox Date: Thu, 19 Mar 2026 13:33:55 -0500 Subject: Try to use macos-14 (#244) --- .github/workflows/mac.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.github/workflows/mac.yml') diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml index 27a0a5ac..d7471c18 100644 --- a/.github/workflows/mac.yml +++ b/.github/workflows/mac.yml @@ -6,7 +6,7 @@ on: jobs: build: - runs-on: macOS-15 + runs-on: macos-14 steps: - uses: actions/checkout@v4 with: -- cgit v1.2.3 From 3e3e7b8af9eac176f13f1aebef9a62e0e7971237 Mon Sep 17 00:00:00 2001 From: Garrett Cox Date: Fri, 20 Mar 2026 18:02:12 -0500 Subject: MacOS CI Universal Build (#246) * Another attempt * Use macports --- .github/workflows/mac.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to '.github/workflows/mac.yml') diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml index d7471c18..266a808a 100644 --- a/.github/workflows/mac.yml +++ b/.github/workflows/mac.yml @@ -8,16 +8,16 @@ jobs: build: runs-on: macos-14 steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: submodules: recursive - - uses: actions/cache@v4 + - uses: melusina-org/setup-macports@v1 with: - path: ~/Library/Caches/Homebrew - key: ${{ runner.os }}-${{ runner.arch }}-homebrew-${{ github.ref }}-${{ github.sha }} - - name: Install dependencies - run: HOMEBREW_NO_AUTO_UPDATE=1 brew bundle --no-upgrade + parameters: '.github/macports.yml' + - uses: hendrikmuhs/ccache-action@v1.2 + with: + key: macos-ccache-${{ github.ref }} - name: Build run: | - cmake -H. -Bbuild-cmake -GNinja -DCMAKE_BUILD_TYPE=Release + cmake -H. -Bbuild-cmake -GNinja -DCMAKE_BUILD_TYPE=Release -D CMAKE_C_COMPILER_LAUNCHER=ccache -D CMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" cmake --build build-cmake -j \ No newline at end of file -- cgit v1.2.3 From 62eb5a198bc5a8806f8c1b43551cd689e929455e Mon Sep 17 00:00:00 2001 From: Garrett Cox Date: Fri, 20 Mar 2026 21:53:27 -0500 Subject: Tweak actions cache (#248) --- .github/workflows/mac.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.github/workflows/mac.yml') diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml index 266a808a..569dcca2 100644 --- a/.github/workflows/mac.yml +++ b/.github/workflows/mac.yml @@ -16,7 +16,7 @@ jobs: parameters: '.github/macports.yml' - uses: hendrikmuhs/ccache-action@v1.2 with: - key: macos-ccache-${{ github.ref }} + key: macos # ccache-macos - name: Build run: | cmake -H. -Bbuild-cmake -GNinja -DCMAKE_BUILD_TYPE=Release -D CMAKE_C_COMPILER_LAUNCHER=ccache -D CMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -- cgit v1.2.3