diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 4658cb0..b2b1348 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -13,7 +13,7 @@ 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" @@ -21,9 +21,14 @@ jobs: - 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 }} @@ -39,6 +44,14 @@ 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 @@ -46,4 +59,4 @@ jobs: name: build-test-artifacts path: | SRC_engines/build/*.zip - SRC_engines/build/*.tar.gz \ No newline at end of file + SRC_engines/build/*.tar.gz