diff options
| author | Kae <80987908+Novaenia@users.noreply.github.com> | 2025-06-03 13:23:24 +1000 |
|---|---|---|
| committer | Kae <80987908+Novaenia@users.noreply.github.com> | 2025-06-03 13:23:24 +1000 |
| commit | 533f1d37d8253de8af175b5a83a05f707c1f498b (patch) | |
| tree | d59bf339588dd34d63a0c46097841b46508092d7 | |
| parent | 2b5bb8342316e66a6ef26ca4578567c833703ad6 (diff) | |
improve macOS CI
[skip ci]
| -rw-r--r-- | .github/workflows/build.yml | 39 | ||||
| -rwxr-xr-x | scripts/ci/macos/assemble.sh | 4 |
2 files changed, 33 insertions, 10 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2574694..8dc54f8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -350,18 +350,29 @@ jobs: configurePreset: 'macos-release' buildPreset: 'macos-release' testPreset: 'macos-release' + + - name: Save VCPKG cache + uses: actions/cache/save@v4 + with: + path: ${{ github.workspace }}/vcpkg_cache + key: vcpkg-${{github.job}}-${{ hashFiles('**/source/vcpkg.json') }} - name: Upload Artifacts uses: actions/upload-artifact@v4 with: name: OpenStarbound-macOS-Intel path: dist/* - - - name: Save VCPKG cache - uses: actions/cache/save@v4 + + - name: Assemble Files + working-directory: ${{ github.workspace }} + run: scripts/ci/macos/assemble.sh + + - name: Upload Client Files + uses: actions/upload-artifact@v4 with: - path: ${{ github.workspace }}/vcpkg_cache - key: vcpkg-${{github.job}}-${{ hashFiles('**/source/vcpkg.json') }} + name: OpenStarbound-macOS-Intel-Client + path: client.tar + build-mac-arm: name: Build OpenStarbound macOS arm64 runs-on: macos-14 @@ -407,14 +418,24 @@ jobs: buildPreset: 'macos-arm-release' testPreset: 'macos-arm-release' + - name: Save VCPKG cache + uses: actions/cache/save@v4 + with: + path: ${{ github.workspace }}/vcpkg_cache + key: vcpkg-${{github.job}}-${{ hashFiles('**/source/vcpkg.json') }} + - name: Upload Artifacts uses: actions/upload-artifact@v4 with: name: OpenStarbound-macOS-Silicon path: dist/* - - name: Save VCPKG cache - uses: actions/cache/save@v4 + - name: Assemble Files + working-directory: ${{ github.workspace }} + run: scripts/ci/macos/assemble.sh + + - name: Upload Client Files + uses: actions/upload-artifact@v4 with: - path: ${{ github.workspace }}/vcpkg_cache - key: vcpkg-${{github.job}}-${{ hashFiles('**/source/vcpkg.json') }} + name: OpenStarbound-macOS-Silicon-Client + path: client.tar diff --git a/scripts/ci/macos/assemble.sh b/scripts/ci/macos/assemble.sh index 2e8164d..d31c24f 100755 --- a/scripts/ci/macos/assemble.sh +++ b/scripts/ci/macos/assemble.sh @@ -25,4 +25,6 @@ cp \ scripts/ci/macos/sbinit.config \ scripts/ci/macos/run-server.sh \ scripts/steam_appid.txt \ - client_distribution/osx/
\ No newline at end of file + client_distribution/osx/ + +tar -cvf client.tar client_distribution |