Skip to content

Commit

Permalink
Merge pull request #70 from USEPA/triplet_build
Browse files Browse the repository at this point in the history
Update to build for both intel and m1 chips for macos
  • Loading branch information
woohn authored Dec 12, 2024
2 parents 044a4ae + e6a3342 commit 8cf3451
Showing 1 changed file with 16 additions and 3 deletions.
19 changes: 16 additions & 3 deletions .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,22 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [windows-latest, ubuntu-latest, macos-latest]
os: [windows-latest, ubuntu-latest, macos-13, macos-14]
include:
- os: windows-latest
cmake_generator: -G "Visual Studio 17 2022" -A "x64"
continue-on-error: false
- os: ubuntu-latest
cmake_generator: -G "Unix Makefiles"
continue-on-error: false
- os: macos-latest
- os: macos-13
cmake_generator: -G "Xcode"
continue-on-error: false
alias: intel-mac
- os: macos-14
cmake_generator: -G "Xcode"
continue-on-error: false
alias: apple-silicon
runs-on: ${{ matrix.os }}
continue-on-error: ${{ matrix.continue-on-error }}

Expand All @@ -39,11 +44,19 @@ jobs:
cmake -B build ${{ matrix.cmake_generator }} .
cmake --build build --config Release --target package
- name: Qualify darwin artifacts with os versions
if: matrix.os == 'macos-13' || matrix.os == 'macos-14'
run: |
cd SRC_engines/build
for file in *.zip; do mv "$file" "${file%.zip}-${{ matrix.alias }}.zip"; done
for file in *.tar.gz; do mv "$file" "${file%.tar.gz}-${{ matrix.alias }}.tar.gz"; done
cd ../..
- name: Upload artifacts
if: ${{ always() }}
uses: actions/upload-artifact@v3
with:
name: build-test-artifacts
path: |
SRC_engines/build/*.zip
SRC_engines/build/*.tar.gz
SRC_engines/build/*.tar.gz

0 comments on commit 8cf3451

Please sign in to comment.