Skip to content

Commit

Permalink
fix(CI): Removed macos M1 runner
Browse files Browse the repository at this point in the history
  • Loading branch information
SaptarshiSarkar12 committed Feb 21, 2024
1 parent a69114d commit b88285f
Showing 1 changed file with 5 additions and 20 deletions.
25 changes: 5 additions & 20 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
name: Build [${{ matrix.os }}, ${{ matrix.mode }}]
strategy:
matrix:
os: ["windows-latest", "macos-latest", "ubuntu-latest", "macos-14"] # macos-14 has arm64 architecture, others have amd64
os: ["windows-latest", "macos-latest", "ubuntu-latest"]
mode: ["CLI", "GUI"]
fail-fast: false
runs-on: ${{ matrix.os }}
Expand All @@ -54,12 +54,7 @@ jobs:
- name: Package Drifty CLI for ${{ matrix.os }} with GraalVM
if: ${{ matrix.mode == 'CLI' }}
shell: bash
run: |
if ${{ matrix.os == 'macos-latest' || matrix.os == 'macos-14' }}; then
mvn -P build-drifty-cli-for-macos-latest package
else
mvn -P build-drifty-cli-for-${{ matrix.os }} package
fi
run: mvn -P build-drifty-cli-for-${{ matrix.os }} package
- name: Set Up Maven version 3.8.8 # For GUI build issues, maven version 3.8.8 needs to be used
if: ${{ matrix.mode == 'GUI' }}
uses: stCarolas/setup-maven@v5
Expand All @@ -68,23 +63,13 @@ jobs:
- name: Build platform-specific C object for missing jdk libraries
if: ${{ matrix.mode == 'GUI' }}
shell: bash
run: |
if ${{ matrix.os == 'macos-latest' || matrix.os == 'macos-14' }}; then
gcc -c config/missing_symbols.c -o config/missing_symbols-macos-latest.o
else
gcc -c config/missing_symbols.c -o config/missing_symbols-${{ matrix.os }}.o
fi
run: gcc -c config/missing_symbols.c -o config/missing_symbols-${{ matrix.os }}.o
- name: Install dependency modules for GUI
if: ${{ matrix.mode == 'GUI' }}
run: mvn -U clean install
- name: Package Drifty GUI for ${{ matrix.os }} with GluonFX maven plugin
if: ${{ matrix.mode == 'GUI' }}
run: |
if ${{ matrix.os == 'macos-latest' || matrix.os == 'macos-14' }}; then
mvn -P build-drifty-gui-for-macos-latest gluonfx:build gluonfx:package -rf :GUI
else
mvn -P build-drifty-gui-for-${{ matrix.os }} gluonfx:build gluonfx:package -rf :GUI
fi
run: mvn -P build-drifty-gui-for-${{ matrix.os }} gluonfx:build gluonfx:package -rf :GUI
- name: Create Application Type specific folders
run: |
mkdir build
Expand Down Expand Up @@ -113,7 +98,7 @@ jobs:
mv "GUI/target/gluonfx/x86_64-windows/Drifty-GUI.exe" build/GUI
fi
- name: Categorise build artifacts for macOS
if: ${{ matrix.os == 'macos-latest' || matrix.os == 'macos-14' }}
if: ${{ matrix.os == 'macos-latest' }}
run: |
if ${{ matrix.mode == 'CLI' }}; then
mv "CLI/target/CLI/macos/Drifty CLI" "CLI/target/CLI/macos/Drifty-CLI_macos"
Expand Down

0 comments on commit b88285f

Please sign in to comment.