From 05487ee59db01e9a9b0f1db9602aba34d138cccb Mon Sep 17 00:00:00 2001 From: Daniel Thamdrup Date: Tue, 6 Feb 2024 15:28:17 +0100 Subject: [PATCH] add amigam68k gha Signed-off-by: Daniel Thamdrup --- .github/workflows/amiga-m68k.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.github/workflows/amiga-m68k.yml b/.github/workflows/amiga-m68k.yml index 98157176987c..fc71a3a05e2c 100644 --- 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,6 +40,7 @@ jobs: - name: Configure CMake run: | +<<<<<<< HEAD cmake \ -S . \ -B build \ @@ -43,6 +48,12 @@ jobs: -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