Try and update the build scripts to use a matrix.

This commit is contained in:
David Given
2024-10-15 23:07:36 +02:00
parent 8a23046187
commit 45f769893c
2 changed files with 15 additions and 8 deletions

View File

@@ -25,7 +25,10 @@ jobs:
run: CXXFLAGS="-Wp,-D_GLIBCXX_ASSERTIONS" make -j`nproc` -C fluxengine
build-macos-current:
runs-on: macos-latest
strategy:
matrix:
runs-on: [macos-13, macos-14-arm64]
runs-on: ${{ matrix.runs-on }}
steps:
- uses: actions/checkout@v4
with:
@@ -39,12 +42,11 @@ jobs:
run: |
brew install sqlite pkg-config libusb protobuf wxwidgets fmt make coreutils dylibbundler libjpeg
- name: make
run: gmake -j1 -C fluxengine V=1
run: gmake -C fluxengine
- name: Upload build artifacts
uses: actions/upload-artifact@v4
with:
name: ${{ github.event.repository.name }}.${{ github.sha }}.fluxengine.pkg
name: ${{ github.event.repository.name }}.${{ github.sha }}.fluxengine.${{ matrix.runs-on }}.pkg
path: fluxengine/FluxEngine.pkg
build-windows:

View File

@@ -85,7 +85,10 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
build-macos:
runs-on: macos-13
strategy:
matrix:
runs-on: [macos-13, macos-14-arm64]
runs-on: ${{ matrix.runs-on }}
steps:
- uses: actions/checkout@v4
@@ -93,7 +96,9 @@ jobs:
run: brew install sqlite pkg-config libusb protobuf wxwidgets fmt make coreutils dylibbundler libjpeg
- name: make
run: gmake -j`nproc`
run: |
gmake
mv FluxEngine.pkg FluxEngine-${{ matrix.runs-on }}.pkg
- name: tag
uses: EndBug/latest-tag@latest
@@ -109,7 +114,7 @@ jobs:
token: ${{ github.token }}
tag: dev
assets: |
FluxEngine.pkg
FluxEngine-${{ matrix.runs-on }}.pkg
fail-if-no-assets: false
- name: release
@@ -117,7 +122,7 @@ jobs:
with:
name: Development build ${{ env.RELEASE_DATE }}
files: |
FluxEngine.pkg
FluxEngine-${{ matrix.runs-on }}.pkg
tag_name: dev
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}