diff --git a/.github/workflows/build-and-test-feature.yml b/.github/workflows/build-and-test-feature.yml index 8f147bf4e..c34aea7cb 100644 --- a/.github/workflows/build-and-test-feature.yml +++ b/.github/workflows/build-and-test-feature.yml @@ -3,7 +3,7 @@ name: Build and test on: push: branches: - - "feature/**" + - "feature/**" pull_request: types: - opened # triggers build when opened @@ -14,14 +14,13 @@ on: workflow_dispatch: jobs: - build: - strategy: fail-fast: false matrix: platform: - macos-12 + - macos-14 build_type: - Release diff --git a/.github/workflows/build-and-test-master-release.yml b/.github/workflows/build-and-test-master-release.yml index 89f12d308..c6fd36c02 100644 --- a/.github/workflows/build-and-test-master-release.yml +++ b/.github/workflows/build-and-test-master-release.yml @@ -9,15 +9,13 @@ on: workflow_dispatch: jobs: - build: - strategy: fail-fast: false matrix: platform: - macos-12 - - macos-13-xlarge + - macos-14 build_type: - Release diff --git a/.github/workflows/build-and-test-workflow.yml b/.github/workflows/build-and-test-workflow.yml index e067734e8..8de07c0c0 100644 --- a/.github/workflows/build-and-test-workflow.yml +++ b/.github/workflows/build-and-test-workflow.yml @@ -13,9 +13,7 @@ on: type: string jobs: - build: - # Build platform runs-on: ${{ inputs.platform }} @@ -30,7 +28,6 @@ jobs: # Build steps steps: - # Step: Checkout - name: Checkout uses: actions/checkout@v4 @@ -41,7 +38,7 @@ jobs: # Step: Set paths - name: Set paths id: paths - run : | + run: | echo "build_dir=${{ github.workspace }}/build" >> $GITHUB_OUTPUT echo "ext_deps_dir=${{ github.workspace }}/external_dependencies" >> $GITHUB_OUTPUT echo "install_dir=${{ github.workspace }}/install" >> $GITHUB_OUTPUT @@ -92,7 +89,7 @@ jobs: -DCMAKE_BUILD_TYPE=${{ inputs.build_type }} -DCMAKE_PREFIX_PATH=${{ steps.paths.outputs.ext_deps_dir }}/netcdf-c/install/netcdf-c -DCMAKE_INSTALL_PREFIX=${{ steps.paths.outputs.install_dir }} - + # Step: CMake build - name: Build run: cmake --build ${{ steps.paths.outputs.build_dir }} --config ${{ inputs.build_type }} -j @@ -110,7 +107,7 @@ jobs: # Step: CMake install - name: Install run: cmake --install ${{ steps.paths.outputs.build_dir }} - + # Step: Upload artifacts - name: Upload artifacts uses: actions/upload-artifact@v4