Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

workflows: macos: Use matrix for building Apple Silicon artefacts #8765

Merged
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 21 additions & 3 deletions .github/workflows/call-build-macos.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -64,12 +64,21 @@ jobs:

call-build-macos-package:
if: needs.call-build-macos-legacy-check.outputs.build-type == 'modern'
runs-on: macos-latest
runs-on: ${{ matrix.config.runner }}
environment: ${{ inputs.environment }}
needs:
- call-build-macos-legacy-check
permissions:
contents: read
strategy:
fail-fast: false
matrix:
config:
- name: "Normal macOS-latest runner (Intel)"
runner: macos-12
- name: "Apple Silicon macOS runner"
runner: macos-14

steps:
- name: Checkout repository
uses: actions/checkout@v4
Expand All @@ -92,7 +101,7 @@ jobs:
- name: Upload build packages
uses: actions/upload-artifact@v4
with:
name: macos-packages
name: macos-packages on ${{ matrix.config.runner }}
path: |
build/fluent-bit-*-apple*
build/fluent-bit-*-intel*
Expand All @@ -108,6 +117,15 @@ jobs:
- call-build-macos-package
permissions:
contents: read
strategy:
fail-fast: false
matrix:
config:
- name: "Normal macOS-latest package (Intel)"
os: macos-12
- name: "Apple Silicon macOS package"
os: macos-14

steps:
- name: Checkout repository
uses: actions/checkout@v4
Expand All @@ -118,7 +136,7 @@ jobs:
continue-on-error: true
uses: actions/download-artifact@v4
with:
name: macos-packages
name: macos-packages on ${{ matrix.config.os }}
path: artifacts/

- name: Push MacOS packages to S3
Expand Down
Loading