diff --git a/.circleci/config.yml b/.circleci/config.yml index 7fd42ef89811..8a19035777b5 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,5 +1,6 @@ version: 2 jobs: +<<<<<<< HEAD switch: docker: - image: devkitpro/devkita64:latest @@ -11,6 +12,8 @@ jobs: - run: /opt/devkitpro/portlibs/switch/bin/aarch64-none-elf-cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=RelWithDebInfo - run: cmake --build build -j 2 - store_artifacts: {path: ./build/devilutionx.nro, destination: devilutionx.nro} +======= +>>>>>>> 1e6565c5c (add switch gha) 3ds: docker: - image: devkitpro/devkitarm:latest diff --git a/.github/workflows/switch.yml b/.github/workflows/switch.yml index c3d0032befe5..99e28bfade66 100644 --- a/.github/workflows/switch.yml +++ b/.github/workflows/switch.yml @@ -24,7 +24,11 @@ concurrency: jobs: build: runs-on: macos-14 +<<<<<<< HEAD container: devkitpro/devkita64:latest +======= + container: devkitpro/devkita64:20240120 +>>>>>>> 8c6884088 (add switch gha) steps: - name: Checkout uses: actions/checkout@v4 @@ -34,16 +38,25 @@ jobs: - name: Install dependencies run: | apt-get update && \ +<<<<<<< HEAD apt-get install -y --no-install-recommends --no-install-suggests \ +======= + apt-get install -y \ +>>>>>>> 8c6884088 (add switch gha) gettext - name: Configure CMake run: | +<<<<<<< HEAD cmake \ -S . \ -B build \ -D CMAKE_BUILD_TYPE=RelWithDebInfo \ -D CMAKE_TOOLCHAIN_FILE=/opt/devkitpro/cmake/Switch.cmake +======= + /opt/devkitpro/portlibs/switch/bin/aarch64-none-elf-cmake -S. -Bbuild \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo +>>>>>>> 8c6884088 (add switch gha) - name: Build DevilutionX run: cmake --build build -j$(nproc) @@ -59,7 +72,12 @@ jobs: if: ${{ github.event_name == 'release' && !env.ACT }} uses: svenstaro/upload-release-action@v2 with: +<<<<<<< HEAD asset_name: devilutionx-switch.nro file: ./build/devilutionx.nro +======= + file: ./build/devilutionx.nro + file_glob: true +>>>>>>> 8c6884088 (add switch gha) overwrite: true ...