add amigam68k gha

Signed-off-by: Daniel Thamdrup <[email protected]>
diasurgical · Feb 7, 2024 · 05487ee · 05487ee
1 parent 844b75e
commit 05487ee
Showing 1 changed file with 11 additions and 0 deletions.
diff --git a/.github/workflows/amiga-m68k.yml b/.github/workflows/amiga-m68k.yml
@@ -23,7 +23,11 @@ concurrency:
 
 jobs:
   build:
+<<<<<<< HEAD
     runs-on: ubuntu-latest
+=======
+    runs-on: ubuntu-22.04
+>>>>>>> a6db2cd2c (add amigam68k gha)
     container: amigadev/crosstools:m68k-amigaos-gcc10
     steps:
       - name: Checkout
@@ -36,13 +40,20 @@ jobs:
 
       - name: Configure CMake
         run: |
+<<<<<<< HEAD
           cmake \
             -S . \
             -B build \
             -G Ninja \
             -D M68K_COMMON="-s -fbbb=- -ffast-math -O2" \
             -D M68K_CPU=68040 \
             -D M68K_FPU=hard
+=======
+          cmake -S. -Bbuild -GNinja \
+            -DM68K_COMMON="-s -fbbb=- -ffast-math -O2" \
+            -DM68K_CPU=68040 \
+            -DM68K_FPU=hard
+>>>>>>> a6db2cd2c (add amigam68k gha)
 
       - name: Build DevilutionX
         run: cmake --build build