From b88285f76c2891e4b850b8d338510dade8964f03 Mon Sep 17 00:00:00 2001
From: Saptarshi Sarkar <saptarshi.programmer@gmail.com>
Date: Wed, 21 Feb 2024 23:43:51 +0530
Subject: [PATCH] fix(CI): Removed macos M1 runner

---
 .github/workflows/build.yml | 25 +++++--------------------
 1 file changed, 5 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 72b6893b4..c1c9b849c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -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 }}
@@ -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
@@ -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
@@ -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"