diff --git a/.github/workflows/14.yml b/.github/workflows/14.yml index 0ba08e4..b71e155 100644 --- a/.github/workflows/14.yml +++ b/.github/workflows/14.yml @@ -73,6 +73,24 @@ jobs: os: windows-latest host_profile: -pr:h cortex-m33f + verify-macos-14-arm-cortex-m1: + uses: ./.github/workflows/verify.yml + with: + display_name: Mac 14 ARM → Cortex-m1 + version: ${{ inputs.version }} + os: macos-15 + host_profile: -pr:h cortex-m1 + cross_build_only: true + + verify-macos-15-arm-cortex-m7d: + uses: ./.github/workflows/verify.yml + with: + display_name: Mac 15 ARM → Cortex-M7D + version: ${{ inputs.version }} + os: macos-15 + host_profile: -pr:h cortex-m7d + cross_build_only: true + upload-package: needs: - verify-linux-x86_64 @@ -81,6 +99,8 @@ jobs: - verify-linux-x86_64-cortex-m4f - verify-linux-arm-cortex-m4 - verify-windows-x86_64-cortex-m33f + - verify-macos-14-arm-cortex-m1 + - verify-macos-15-arm-cortex-m7d if: ${{ startsWith(github.ref, 'refs/tags/') && inputs.upload == true }} uses: ./.github/workflows/upload.yml secrets: inherit diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5b33748..7e91c67 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,6 +21,10 @@ on: branches: - main +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + jobs: ci_14: uses: ./.github/workflows/14.yml diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml index a11ee89..e5050e1 100644 --- a/.github/workflows/verify.yml +++ b/.github/workflows/verify.yml @@ -29,6 +29,9 @@ on: host_profile: type: string default: "" + cross_build_only: + type: boolean + default: false env: VERBOSE: "1" @@ -74,6 +77,7 @@ jobs: run: conan create all --version=${{ inputs.version }} --build-require --build=cmake --build=missing:cmake/* -pr:h gcc-${{ inputs.version }} ${{ inputs.host_profile }} --build=make --build=missing:make/* - name: ⚙️ Build/Install ninja from scratch using gcc for build platform + if: ${{ inputs.cross_build_only == false }} run: > conan install --tool-requires="ninja/1.13.2" --build="ninja/*" -pr:a gcc-${{ inputs.version }} --build=cmake --build=missing:cmake/*