From 844b75ef7cb61176ab7621cdd934ece7f362e411 Mon Sep 17 00:00:00 2001 From: Daniel Thamdrup Date: Tue, 6 Feb 2024 13:48:36 +0100 Subject: [PATCH] more cleanup Signed-off-by: Daniel Thamdrup --- .circleci/config.yml | 3 +++ .github/workflows/switch.yml | 10 ++++++++++ 2 files changed, 13 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 8a19035777b..2f1c6aeb0c5 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,5 +1,6 @@ version: 2 jobs: +<<<<<<< HEAD <<<<<<< HEAD switch: docker: @@ -31,6 +32,8 @@ jobs: - run: cmake --build build -j 2 - store_artifacts: {path: ./build/devilutionx.3dsx, destination: devilutionx.3dsx} - store_artifacts: {path: ./build/devilutionx.cia, destination: devilutionx.cia} +======= +>>>>>>> 0256ae65c (more cleanup) amigaos-m68k: docker: - image: amigadev/crosstools:m68k-amigaos-gcc10 diff --git a/.github/workflows/switch.yml b/.github/workflows/switch.yml index 99e28bfade6..5c85515b7e0 100644 --- a/.github/workflows/switch.yml +++ b/.github/workflows/switch.yml @@ -38,15 +38,20 @@ jobs: - name: Install dependencies run: | apt-get update && \ +<<<<<<< HEAD <<<<<<< HEAD apt-get install -y --no-install-recommends --no-install-suggests \ ======= apt-get install -y \ >>>>>>> 8c6884088 (add switch gha) +======= + apt-get install -y --no-install-recommends --no-install-suggests \ +>>>>>>> ffcdecf17 (more cleanup) gettext - name: Configure CMake run: | +<<<<<<< HEAD <<<<<<< HEAD cmake \ -S . \ @@ -57,6 +62,11 @@ jobs: /opt/devkitpro/portlibs/switch/bin/aarch64-none-elf-cmake -S. -Bbuild \ -DCMAKE_BUILD_TYPE=RelWithDebInfo >>>>>>> 8c6884088 (add switch gha) +======= + cmake -S. -Bbuild \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_TOOLCHAIN_FILE=/opt/devkitpro/cmake/Switch.cmake +>>>>>>> ffcdecf17 (more cleanup) - name: Build DevilutionX run: cmake --build build -j$(nproc)