Skip to content

Commit

Permalink
[CI] Updated Mac CIS script.
Browse files Browse the repository at this point in the history
- Upload static lib version as CIS artifact to simplify example startup.
- Use new CompileMetalToMetallib.sh script to bundle default.metallib with apps.
- Use GitHub runner architecture variable in output name instead of fixed "x64".
  • Loading branch information
LukasBanana committed Sep 10, 2024
1 parent 1abdd1b commit fc167fe
Showing 1 changed file with 8 additions and 7 deletions.
15 changes: 8 additions & 7 deletions .github/workflows/ci_macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:

- name: Configure CMake
run: >
cmake -S . -B ${{github.workspace}}/macOS-x64
cmake -S . -B ${{github.workspace}}/macOS-$env:RUNNER_ARCH
-DCMAKE_BUILD_TYPE=${{ matrix.config }}
-DLLGL_BUILD_STATIC_LIB=${{ matrix.lib == 'Static' && 'ON' || 'OFF' }}
-DLLGL_BUILD_RENDERER_OPENGL=ON
Expand All @@ -39,19 +39,20 @@ jobs:
- name: Build
run: |
cmake --build ${{github.workspace}}/macOS-x64 --config ${{ matrix.config }}
cmake --build ${{github.workspace}}/macOS-$env:RUNNER_ARCH --config ${{ matrix.config }}
scripts/CompileMetalToMetallib.sh macosx "${{ github.workspace }}/macOS-$env:RUNNER_ARCH/build" -v
CURRENT_TIME=$(date)
echo "LLGL built with Xcode for macOS on $CURRENT_TIME." > ${{ env.README }}
echo "Place at root of LLGL repository to run examples and testbed." >> ${{ env.README }}
- name: Upload Binaries
uses: actions/upload-artifact@v4
if: matrix.lib == 'Shared' && matrix.config == 'Release'
if: matrix.lib == 'Static' && matrix.config == 'Release'
with:
name: LLGL-macOS-${{ matrix.config }}-x86_64
name: LLGL-macOS-${{ matrix.config }}-$env:RUNNER_ARCH
path: |
${{ env.README }}
${{ github.workspace }}/macOS-x64/build/libLLGL*.dylib
${{ github.workspace }}/macOS-x64/build/Example_*.app
${{ github.workspace }}/macOS-x64/build/Testbed*.app
${{ github.workspace }}/macOS-$env:RUNNER_ARCH/build/libLLGL*.dylib
${{ github.workspace }}/macOS-$env:RUNNER_ARCH/build/Example_*.app
${{ github.workspace }}/macOS-$env:RUNNER_ARCH/build/Testbed*.app

0 comments on commit fc167fe

Please sign in to comment.