diff options
| author | Garrett Cox <garrettjcox@gmail.com> | 2026-03-20 18:02:12 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-03-20 20:02:12 -0300 |
| commit | 3e3e7b8af9eac176f13f1aebef9a62e0e7971237 (patch) | |
| tree | 3751cbf1dc766679ae2b9d4e198253e3455e81a0 /.github/workflows | |
| parent | 0b90f2620e565a622f6f2b1256022d4c12fcea50 (diff) | |
MacOS CI Universal Build (#246)
* Another attempt
* Use macports
Diffstat (limited to '.github/workflows')
| -rw-r--r-- | .github/workflows/mac.yml | 14 | ||||
| -rw-r--r-- | .github/workflows/main.yml | 53 |
2 files changed, 16 insertions, 51 deletions
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 diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e35cc68e..41c68a74 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -73,57 +73,22 @@ jobs: name: starship-windows path: starship-release - build-macos-x64: - needs: generate-port-o2r - runs-on: macos-14-large # macos-14-large is the only way we can get x64 - 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: 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: Download starship.o2r - uses: actions/download-artifact@v4 - with: - name: starship.o2r - path: ./build-cmake - - name: Create Package - run: | - (cd build-cmake && cpack) - mv _packages/*.dmg Starship.dmg - mv README.md readme.txt - - name: Publish packaged artifacts - uses: actions/upload-artifact@v4 - with: - name: Starship-mac-x64 - path: | - Starship.dmg - readme.txt - - build-macos-arm64: + build-macos: needs: generate-port-o2r 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 - name: Download starship.o2r uses: actions/download-artifact@v4 @@ -138,7 +103,7 @@ jobs: - name: Publish packaged artifacts uses: actions/upload-artifact@v4 with: - name: Starship-mac-arm64 + name: Starship-mac path: | Starship.dmg readme.txt |