make macOS A64 and X64 seperate build targets bc FUCK matrixes

This commit is contained in:
OwnedByWuigi 2025-06-18 15:43:35 +01:00 committed by GitHub
parent e775abe4bf
commit 2b7bdfe99b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -94,13 +94,10 @@ jobs:
with: with:
name: Pound-win64-${{env.BUILD_TYPE}}-${{ needs.get-info.outputs.commit }}-${{needs.get-info.outputs.shorthash}} name: Pound-win64-${{env.BUILD_TYPE}}-${{ needs.get-info.outputs.commit }}-${{needs.get-info.outputs.shorthash}}
path: artifact/ path: artifact/
macOS: macOS-x86_64:
name: macOS ${{ matrix.arch }} name: macOS x86_64
runs-on: macos-14 runs-on: macos-14
needs: get-info needs: get-info
strategy:
matrix:
arch: [arm64, x86_64]
steps: steps:
- uses: actions/checkout@main - uses: actions/checkout@main
with: with:
@ -112,24 +109,59 @@ jobs:
brew update brew update
brew install cmake ninja ccache brew install cmake ninja ccache
- name: Configure CMake for ${{ matrix.arch }} - name: Configure CMake (x86_64)
run: > run: >
cmake -G Ninja -B "${{env.BUILD_DIR}}" cmake -G Ninja -B "${{env.BUILD_DIR}}"
-DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
-DCMAKE_OSX_ARCHITECTURES=${{ matrix.arch }} -DCMAKE_OSX_ARCHITECTURES=x86_64
-DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15
- name: Build for ${{ matrix.arch }} - name: Build (x86_64)
run: cmake --build "${{env.BUILD_DIR}}" --config ${{env.BUILD_TYPE}} --parallel $(sysctl -n hw.logicalcpu) run: cmake --build "${{env.BUILD_DIR}}" --config ${{env.BUILD_TYPE}} --parallel $(sysctl -n hw.logicalcpu)
- name: Prepare Artifact Folder - name: Prepare Artifact Folder
run: | run: |
mkdir -p artifact mkdir -p artifact
cp -r ${{env.BUILD_DIR}}/Pound artifact/Pound-${{ matrix.arch }}-macOS-${{env.BUILD_TYPE}} cp -r ${{env.BUILD_DIR}}/Pound artifact/Pound-x86_64-macOS-${{env.BUILD_TYPE}}
- name: Upload macOS Artifact - name: Upload Artifact
uses: actions/upload-artifact@main uses: actions/upload-artifact@main
with: with:
name: Pound-macOS-${{ matrix.arch }}-${{env.BUILD_TYPE}}-${{ needs.get-info.outputs.commit }}-${{needs.get-info.outputs.shorthash }} name: Pound-macOS-x86_64-${{env.BUILD_TYPE}}-${{ needs.get-info.outputs.commit }}-${{ needs.get-info.outputs.shorthash }}
path: artifact/ path: artifact/
macOS-arm64:
name: macOS ARM64
runs-on: macos-14
needs: get-info
steps:
- uses: actions/checkout@main
with:
submodules: recursive
fetch-depth: 0
- name: Install Dependencies
run: |
brew update
brew install cmake ninja ccache
- name: Configure CMake (ARM64)
run: >
cmake -G Ninja -B "${{env.BUILD_DIR}}"
-DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
-DCMAKE_OSX_ARCHITECTURES=arm64
-DCMAKE_OSX_DEPLOYMENT_TARGET=10.15
- name: Build (ARM64)
run: cmake --build "${{env.BUILD_DIR}}" --config ${{env.BUILD_TYPE}} --parallel $(sysctl -n hw.logicalcpu)
- name: Prepare Artifact Folder
run: |
mkdir -p artifact
cp -r ${{env.BUILD_DIR}}/Pound artifact/Pound-arm64-macOS-${{env.BUILD_TYPE}}
- name: Upload Artifact
uses: actions/upload-artifact@main
with:
name: Pound-macOS-arm64-${{env.BUILD_TYPE}}-${{ needs.get-info.outputs.commit }}-${{ needs.get-info.outputs.shorthash }}
path: artifact/