From 9e89e620b231529ae8fa6be83a0b2881431b8ea3 Mon Sep 17 00:00:00 2001 From: Daniel Thamdrup Date: Mon, 5 Feb 2024 12:18:29 +0100 Subject: [PATCH 01/12] add vita gha Signed-off-by: Daniel Thamdrup --- .circleci/config.yml | 10 ------ .github/workflows/vita.yml | 63 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+), 10 deletions(-) create mode 100644 .github/workflows/vita.yml diff --git a/.circleci/config.yml b/.circleci/config.yml index 7fd42ef8981..975f94336ed 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -38,16 +38,6 @@ jobs: - run: cmake -S. -Bbuild -DM68K_CPU=68040 -DM68K_FPU=hard -DM68K_COMMON="-s -fbbb=- -ffast-math -O2" - run: cd build && make -j2 - store_artifacts: {path: ./build/devilutionx, destination: devilutionx_m68k} - vita: - docker: - - image: vitasdk/vitasdk - working_directory: ~/repo - steps: - - checkout - - run: apk --no-cache add git cmake ninja bash pkgconfig gettext - - run: cmake -S. -Bbuild -GNinja -DCMAKE_TOOLCHAIN_FILE=${VITASDK}/share/vita.toolchain.cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo - - run: cmake --build build -j 2 - - store_artifacts: {path: ./build/devilutionx.vpk, destination: devilutionx.vpk} workflows: version: 2 diff --git a/.github/workflows/vita.yml b/.github/workflows/vita.yml new file mode 100644 index 00000000000..9c3b9829afa --- /dev/null +++ b/.github/workflows/vita.yml @@ -0,0 +1,63 @@ +--- +name: Sony PlayStation Vita + +on: # yamllint disable-line rule:truthy + push: + branches: + - master + paths-ignore: + - '*.md' + - 'docs/**' + pull_request: + types: [opened, synchronize] + paths-ignore: + - '*.md' + - 'docs/**' + release: + types: [published] + paths-ignore: + - '*.md' + - 'docs/**' + workflow_dispatch: + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + +jobs: + build: + runs-on: ubuntu-22.04 + container: vitasdk/vitasdk:latest + steps: + - name: Checkout + uses: actions/checkout@v4 + with: + fetch-depth: 0 + + - name: Install dependencies + run: apk --no-cache add git cmake ninja bash pkgconfig gettext + + - name: Configure CMake + run: | + cmake -S. -Bbuild -GNinja \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_TOOLCHAIN_FILE=${VITASDK}/share/vita.toolchain.cmake \ + + - name: Build DevilutionX + run: cmake --build build + + - name: Upload Package + if: ${{ !env.ACT }} + uses: actions/upload-artifact@v4 + with: + name: devilutionx.vpk + path: ./build/devilutionx.vpk + + - name: Update Release + if: ${{ github.event_name == 'release' && !env.ACT }} + uses: svenstaro/upload-release-action@v2 + with: + file: ./build/devilutionx.vpk + file_glob: true + overwrite: true +... From f4db6dc556a107f85f2e9c7fc8cce424a84df6ae Mon Sep 17 00:00:00 2001 From: Daniel Thamdrup Date: Mon, 5 Feb 2024 12:41:58 +0100 Subject: [PATCH 02/12] readability Signed-off-by: Daniel Thamdrup --- .github/workflows/vita.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/vita.yml b/.github/workflows/vita.yml index 9c3b9829afa..1b473dfa4b3 100644 --- a/.github/workflows/vita.yml +++ b/.github/workflows/vita.yml @@ -35,7 +35,15 @@ jobs: fetch-depth: 0 - name: Install dependencies - run: apk --no-cache add git cmake ninja bash pkgconfig gettext + run: | + apk --no-cache add \ + bash \ + cmake \ + gettext \ + git \ + pkgconfig \ + samurai + - name: Configure CMake run: | From 58a64715077c6baa2c572299ee78286e4e7d3e38 Mon Sep 17 00:00:00 2001 From: Daniel Thamdrup Date: Mon, 5 Feb 2024 12:57:23 +0100 Subject: [PATCH 03/12] cleanup Signed-off-by: Daniel Thamdrup --- .github/workflows/vita.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/vita.yml b/.github/workflows/vita.yml index 1b473dfa4b3..85c5eed6b62 100644 --- a/.github/workflows/vita.yml +++ b/.github/workflows/vita.yml @@ -15,9 +15,6 @@ on: # yamllint disable-line rule:truthy - 'docs/**' release: types: [published] - paths-ignore: - - '*.md' - - 'docs/**' workflow_dispatch: concurrency: @@ -37,11 +34,8 @@ jobs: - name: Install dependencies run: | apk --no-cache add \ - bash \ - cmake \ gettext \ git \ - pkgconfig \ samurai From bbb6f325ebe5e886fb8a9e435592bf58195e0c58 Mon Sep 17 00:00:00 2001 From: Daniel Thamdrup Date: Mon, 5 Feb 2024 21:28:10 +0100 Subject: [PATCH 04/12] add switch gha Signed-off-by: Daniel Thamdrup --- .circleci/config.yml | 11 ------- .github/workflows/switch.yml | 62 ++++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+), 11 deletions(-) create mode 100644 .github/workflows/switch.yml diff --git a/.circleci/config.yml b/.circleci/config.yml index 975f94336ed..ae32b101ffd 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,16 +1,5 @@ version: 2 jobs: - switch: - docker: - - image: devkitpro/devkita64:latest - working_directory: ~/repo - steps: - - checkout - - run: apt-get update -y - - run: apt-get install -y gettext - - 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} 3ds: docker: - image: devkitpro/devkitarm:latest diff --git a/.github/workflows/switch.yml b/.github/workflows/switch.yml new file mode 100644 index 00000000000..d9799aa4746 --- /dev/null +++ b/.github/workflows/switch.yml @@ -0,0 +1,62 @@ +--- +name: Nintendo Switch + +on: # yamllint disable-line rule:truthy + push: + branches: + - master + paths-ignore: + - '*.md' + - 'docs/**' + pull_request: + types: [opened, synchronize] + paths-ignore: + - '*.md' + - 'docs/**' + release: + types: [published] + workflow_dispatch: + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + +jobs: + build: + runs-on: macos-14 + container: devkitpro/devkita64:20240120 + steps: + - name: Checkout + uses: actions/checkout@v4 + with: + fetch-depth: 0 + + - name: Install dependencies + run: | + apt-get update && \ + apt-get install -y \ + gettext + + - name: Configure CMake + run: | + /opt/devkitpro/portlibs/switch/bin/aarch64-none-elf-cmake -S. -Bbuild \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo + + - name: Build DevilutionX + run: cmake --build build -j$(nproc) + + - name: Upload Package + if: ${{ !env.ACT }} + uses: actions/upload-artifact@v4 + with: + name: devilutionx.nro + path: ./build/devilutionx.nro + + - name: Update Release + if: ${{ github.event_name == 'release' && !env.ACT }} + uses: svenstaro/upload-release-action@v2 + with: + file: ./build/devilutionx.nro + file_glob: true + overwrite: true +... From 93f3566b49ebf1da46509abc7b5fa4ad13a51d43 Mon Sep 17 00:00:00 2001 From: Daniel Thamdrup Date: Tue, 6 Feb 2024 13:44:58 +0100 Subject: [PATCH 05/12] add 3ds gha Signed-off-by: Daniel Thamdrup --- .circleci/config.yml | 3 -- .github/workflows/3ds.yml | 82 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 82 insertions(+), 3 deletions(-) create mode 100644 .github/workflows/3ds.yml diff --git a/.circleci/config.yml b/.circleci/config.yml index ae32b101ffd..2716ab65615 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -32,7 +32,4 @@ workflows: version: 2 testflow: jobs: - - switch - - 3ds - amigaos-m68k - - vita diff --git a/.github/workflows/3ds.yml b/.github/workflows/3ds.yml new file mode 100644 index 00000000000..a0230b0f815 --- /dev/null +++ b/.github/workflows/3ds.yml @@ -0,0 +1,82 @@ +--- +name: Nintendo 3DS + +on: # yamllint disable-line rule:truthy + push: + branches: + - master + paths-ignore: + - '*.md' + - 'docs/**' + pull_request: + types: [opened, synchronize] + paths-ignore: + - '*.md' + - 'docs/**' + release: + types: [published] + workflow_dispatch: + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + +jobs: + build: + runs-on: ubuntu-22.04 + container: devkitpro/devkitarm:latest + steps: + - name: Checkout + uses: actions/checkout@v4 + with: + fetch-depth: 0 + + - name: Install dependencies + run: | + apt-get update && \ + apt-get install -y --no-install-recommends --no-install-suggests \ + ffmpeg \ + gettext + + - name: Get external dependencies + run: | + wget https://github.com/diasurgical/bannertool/releases/download/1.2.0/bannertool.zip + unzip -j "bannertool.zip" "linux-x86_64/bannertool" -d "/opt/devkitpro/tools/bin" + wget https://github.com/3DSGuy/Project_CTR/releases/download/makerom-v0.18/makerom-v0.18-ubuntu_x86_64.zip + unzip "makerom-v0.18-ubuntu_x86_64.zip" "makerom" -d "/opt/devkitpro/tools/bin" + chmod a+x /opt/devkitpro/tools/bin/makerom + + - name: Configure CMake + run: | + cmake -S. -Bbuild -GNinja \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_TOOLCHAIN_FILE=/opt/devkitpro/cmake/3DS.cmake + + - name: Build DevilutionX + run: cmake --build build + + - name: Upload Package + if: ${{ !env.ACT }} + uses: actions/upload-artifact@v4 + with: + name: devilutionx.3dsx/cia + path: | + ./build/devilutionx.3dsx + ./build/devilutionx.cia + + - name: Update Release 3dsx + if: ${{ github.event_name == 'release' && !env.ACT }} + uses: svenstaro/upload-release-action@v2 + with: + file: ./build/devilutionx.3dsx + file_glob: true + overwrite: true + + - name: Update Release cia + if: ${{ github.event_name == 'release' && !env.ACT }} + uses: svenstaro/upload-release-action@v2 + with: + file: ./build/devilutionx.cia + file_glob: true + overwrite: true +... From 82916ba2dad4ddc6a23b393bae00864af9a8e6a6 Mon Sep 17 00:00:00 2001 From: Daniel Thamdrup Date: Tue, 6 Feb 2024 13:48:36 +0100 Subject: [PATCH 06/12] more cleanup Signed-off-by: Daniel Thamdrup --- .circleci/config.yml | 17 ----------------- .github/workflows/switch.yml | 7 ++++--- .github/workflows/vita.yml | 4 ++-- 3 files changed, 6 insertions(+), 22 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2716ab65615..8eaafbdbc23 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,22 +1,5 @@ version: 2 jobs: - 3ds: - docker: - - image: devkitpro/devkitarm:latest - working_directory: ~/repo - steps: - - checkout - - run: apt-get update -y - - run: apt-get install -y ffmpeg gettext - - run: wget https://github.com/diasurgical/bannertool/releases/download/1.2.0/bannertool.zip - - run: unzip -j "bannertool.zip" "linux-x86_64/bannertool" -d "/opt/devkitpro/tools/bin" - - run: wget https://github.com/3DSGuy/Project_CTR/releases/download/makerom-v0.18/makerom-v0.18-ubuntu_x86_64.zip - - run: unzip "makerom-v0.18-ubuntu_x86_64.zip" "makerom" -d "/opt/devkitpro/tools/bin" - - run: sudo chmod +rx /opt/devkitpro/tools/bin/makerom - - run: cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE=/opt/devkitpro/cmake/3DS.cmake - - run: cmake --build build -j 2 - - store_artifacts: {path: ./build/devilutionx.3dsx, destination: devilutionx.3dsx} - - store_artifacts: {path: ./build/devilutionx.cia, destination: devilutionx.cia} amigaos-m68k: docker: - image: amigadev/crosstools:m68k-amigaos-gcc10 diff --git a/.github/workflows/switch.yml b/.github/workflows/switch.yml index d9799aa4746..cf11419b26c 100644 --- a/.github/workflows/switch.yml +++ b/.github/workflows/switch.yml @@ -34,13 +34,14 @@ jobs: - name: Install dependencies run: | apt-get update && \ - apt-get install -y \ + apt-get install -y --no-install-recommends --no-install-suggests \ gettext - name: Configure CMake run: | - /opt/devkitpro/portlibs/switch/bin/aarch64-none-elf-cmake -S. -Bbuild \ - -DCMAKE_BUILD_TYPE=RelWithDebInfo + cmake -S. -Bbuild \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_TOOLCHAIN_FILE=/opt/devkitpro/cmake/Switch.cmake - name: Build DevilutionX run: cmake --build build -j$(nproc) diff --git a/.github/workflows/vita.yml b/.github/workflows/vita.yml index 85c5eed6b62..411ecc5bb77 100644 --- a/.github/workflows/vita.yml +++ b/.github/workflows/vita.yml @@ -33,7 +33,7 @@ jobs: - name: Install dependencies run: | - apk --no-cache add \ + apk add \ gettext \ git \ samurai @@ -43,7 +43,7 @@ jobs: run: | cmake -S. -Bbuild -GNinja \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - -DCMAKE_TOOLCHAIN_FILE=${VITASDK}/share/vita.toolchain.cmake \ + -DCMAKE_TOOLCHAIN_FILE=${VITASDK}/share/vita.toolchain.cmake - name: Build DevilutionX run: cmake --build build From 31d46e4212738a135cf4b8610f52a6abb06816b1 Mon Sep 17 00:00:00 2001 From: Daniel Thamdrup Date: Tue, 6 Feb 2024 15:28:17 +0100 Subject: [PATCH 07/12] add amigam68k gha Signed-off-by: Daniel Thamdrup --- .circleci/config.yml | 18 ---------- .github/workflows/amiga-m68k.yml | 61 ++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+), 18 deletions(-) delete mode 100644 .circleci/config.yml create mode 100644 .github/workflows/amiga-m68k.yml diff --git a/.circleci/config.yml b/.circleci/config.yml deleted file mode 100644 index 8eaafbdbc23..00000000000 --- a/.circleci/config.yml +++ /dev/null @@ -1,18 +0,0 @@ -version: 2 -jobs: - amigaos-m68k: - docker: - - image: amigadev/crosstools:m68k-amigaos-gcc10 - working_directory: ~/repo - steps: - - checkout - - run: Packaging/amiga/prep.sh - - run: cmake -S. -Bbuild -DM68K_CPU=68040 -DM68K_FPU=hard -DM68K_COMMON="-s -fbbb=- -ffast-math -O2" - - run: cd build && make -j2 - - store_artifacts: {path: ./build/devilutionx, destination: devilutionx_m68k} - -workflows: - version: 2 - testflow: - jobs: - - amigaos-m68k diff --git a/.github/workflows/amiga-m68k.yml b/.github/workflows/amiga-m68k.yml new file mode 100644 index 00000000000..0cdd38a3e81 --- /dev/null +++ b/.github/workflows/amiga-m68k.yml @@ -0,0 +1,61 @@ +--- +name: Amiga M68K + +on: # yamllint disable-line rule:truthy + push: + branches: + - master + paths-ignore: + - '*.md' + - 'docs/**' + pull_request: + types: [opened, synchronize] + paths-ignore: + - '*.md' + - 'docs/**' + release: + types: [published] + workflow_dispatch: + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + +jobs: + build: + runs-on: ubuntu-22.04 + container: amigadev/crosstools:m68k-amigaos-gcc10 + steps: + - name: Checkout + uses: actions/checkout@v4 + with: + fetch-depth: 0 + + - name: Run prep.sh script + run: ./Packaging/amiga/prep.sh + + - name: Configure CMake + run: | + cmake -S. -Bbuild -GNinja \ + -DM68K_COMMON="-s -fbbb=- -ffast-math -O2" \ + -DM68K_CPU=68040 \ + -DM68K_FPU=hard + + - name: Build DevilutionX + run: cmake --build build + + - name: Upload Package + if: ${{ !env.ACT }} + uses: actions/upload-artifact@v4 + with: + name: devilutionx_m68k + path: ./build/devilutionx + + - name: Update Release + if: ${{ github.event_name == 'release' && !env.ACT }} + uses: svenstaro/upload-release-action@v2 + with: + asset_name: devilutionx-amiga-m68k + file: ./build/devilutionx + overwrite: true +... From a8e6c0b593dc161ae5772c22ecb88fa13d68db85 Mon Sep 17 00:00:00 2001 From: Daniel Thamdrup Date: Tue, 6 Feb 2024 15:29:07 +0100 Subject: [PATCH 08/12] final cleanup Signed-off-by: Daniel Thamdrup --- .github/workflows/3ds.yml | 4 ++-- .github/workflows/switch.yml | 2 +- .github/workflows/vita.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/3ds.yml b/.github/workflows/3ds.yml index a0230b0f815..11ac734554e 100644 --- a/.github/workflows/3ds.yml +++ b/.github/workflows/3ds.yml @@ -68,15 +68,15 @@ jobs: if: ${{ github.event_name == 'release' && !env.ACT }} uses: svenstaro/upload-release-action@v2 with: + asset_name: devilutionx-3ds.3dsx file: ./build/devilutionx.3dsx - file_glob: true overwrite: true - name: Update Release cia if: ${{ github.event_name == 'release' && !env.ACT }} uses: svenstaro/upload-release-action@v2 with: + asset_name: devilutionx-3ds.cia file: ./build/devilutionx.cia - file_glob: true overwrite: true ... diff --git a/.github/workflows/switch.yml b/.github/workflows/switch.yml index cf11419b26c..acfbd6ff394 100644 --- a/.github/workflows/switch.yml +++ b/.github/workflows/switch.yml @@ -57,7 +57,7 @@ jobs: if: ${{ github.event_name == 'release' && !env.ACT }} uses: svenstaro/upload-release-action@v2 with: + asset_name: devilutionx-switch.nro file: ./build/devilutionx.nro - file_glob: true overwrite: true ... diff --git a/.github/workflows/vita.yml b/.github/workflows/vita.yml index 411ecc5bb77..7b4528c6311 100644 --- a/.github/workflows/vita.yml +++ b/.github/workflows/vita.yml @@ -59,7 +59,7 @@ jobs: if: ${{ github.event_name == 'release' && !env.ACT }} uses: svenstaro/upload-release-action@v2 with: + asset_name: devilutionx-vita.vpk file: ./build/devilutionx.vpk - file_glob: true overwrite: true ... From 98a56ebd88fb1ea995919616696f9c97ab3c102b Mon Sep 17 00:00:00 2001 From: Daniel Thamdrup Date: Wed, 7 Feb 2024 16:29:46 +0100 Subject: [PATCH 09/12] squeaky clean Signed-off-by: Daniel Thamdrup --- .github/workflows/3ds.yml | 11 +++++++---- .github/workflows/amiga-m68k.yml | 13 ++++++++----- .github/workflows/switch.yml | 10 ++++++---- .github/workflows/vita.yml | 8 +++++--- 4 files changed, 26 insertions(+), 16 deletions(-) diff --git a/.github/workflows/3ds.yml b/.github/workflows/3ds.yml index 11ac734554e..c2942f07c85 100644 --- a/.github/workflows/3ds.yml +++ b/.github/workflows/3ds.yml @@ -23,7 +23,7 @@ concurrency: jobs: build: - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest container: devkitpro/devkitarm:latest steps: - name: Checkout @@ -33,8 +33,8 @@ jobs: - name: Install dependencies run: | - apt-get update && \ - apt-get install -y --no-install-recommends --no-install-suggests \ + apt-get update + apt-get install -y \ ffmpeg \ gettext @@ -48,7 +48,10 @@ jobs: - name: Configure CMake run: | - cmake -S. -Bbuild -GNinja \ + cmake \ + -S . \ + -B build \ + -G Ninja \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_TOOLCHAIN_FILE=/opt/devkitpro/cmake/3DS.cmake diff --git a/.github/workflows/amiga-m68k.yml b/.github/workflows/amiga-m68k.yml index 0cdd38a3e81..98157176987 100644 --- a/.github/workflows/amiga-m68k.yml +++ b/.github/workflows/amiga-m68k.yml @@ -23,7 +23,7 @@ concurrency: jobs: build: - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest container: amigadev/crosstools:m68k-amigaos-gcc10 steps: - name: Checkout @@ -36,10 +36,13 @@ jobs: - name: Configure CMake run: | - cmake -S. -Bbuild -GNinja \ - -DM68K_COMMON="-s -fbbb=- -ffast-math -O2" \ - -DM68K_CPU=68040 \ - -DM68K_FPU=hard + cmake \ + -S . \ + -B build \ + -G Ninja \ + -D M68K_COMMON="-s -fbbb=- -ffast-math -O2" \ + -D M68K_CPU=68040 \ + -D M68K_FPU=hard - name: Build DevilutionX run: cmake --build build diff --git a/.github/workflows/switch.yml b/.github/workflows/switch.yml index acfbd6ff394..c3d0032befe 100644 --- a/.github/workflows/switch.yml +++ b/.github/workflows/switch.yml @@ -24,7 +24,7 @@ concurrency: jobs: build: runs-on: macos-14 - container: devkitpro/devkita64:20240120 + container: devkitpro/devkita64:latest steps: - name: Checkout uses: actions/checkout@v4 @@ -39,9 +39,11 @@ jobs: - name: Configure CMake run: | - cmake -S. -Bbuild \ - -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - -DCMAKE_TOOLCHAIN_FILE=/opt/devkitpro/cmake/Switch.cmake + cmake \ + -S . \ + -B build \ + -D CMAKE_BUILD_TYPE=RelWithDebInfo \ + -D CMAKE_TOOLCHAIN_FILE=/opt/devkitpro/cmake/Switch.cmake - name: Build DevilutionX run: cmake --build build -j$(nproc) diff --git a/.github/workflows/vita.yml b/.github/workflows/vita.yml index 7b4528c6311..33d0e9a43c6 100644 --- a/.github/workflows/vita.yml +++ b/.github/workflows/vita.yml @@ -23,7 +23,7 @@ concurrency: jobs: build: - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest container: vitasdk/vitasdk:latest steps: - name: Checkout @@ -37,11 +37,13 @@ jobs: gettext \ git \ samurai - - name: Configure CMake run: | - cmake -S. -Bbuild -GNinja \ + cmake \ + -S . \ + -B build \ + -G Ninja \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_TOOLCHAIN_FILE=${VITASDK}/share/vita.toolchain.cmake From 01077e2ba8e920da5b0b1222e3a8f7d614964767 Mon Sep 17 00:00:00 2001 From: Daniel Thamdrup Date: Wed, 7 Feb 2024 22:18:13 +0100 Subject: [PATCH 10/12] macos runner doesn't have docker Signed-off-by: Daniel Thamdrup --- .github/workflows/switch.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/switch.yml b/.github/workflows/switch.yml index c3d0032befe..c2293300c7d 100644 --- a/.github/workflows/switch.yml +++ b/.github/workflows/switch.yml @@ -23,7 +23,7 @@ concurrency: jobs: build: - runs-on: macos-14 + runs-on: ubuntu-latest container: devkitpro/devkita64:latest steps: - name: Checkout From 1def6bf3ab072b6c541052a3c88bf08b27b269e4 Mon Sep 17 00:00:00 2001 From: Daniel Thamdrup Date: Wed, 7 Feb 2024 22:23:17 +0100 Subject: [PATCH 11/12] remove illegal character Signed-off-by: Daniel Thamdrup --- .github/workflows/3ds.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/3ds.yml b/.github/workflows/3ds.yml index c2942f07c85..72c19658193 100644 --- a/.github/workflows/3ds.yml +++ b/.github/workflows/3ds.yml @@ -62,7 +62,7 @@ jobs: if: ${{ !env.ACT }} uses: actions/upload-artifact@v4 with: - name: devilutionx.3dsx/cia + name: devilutionx.3dsx and devilutionx.cia path: | ./build/devilutionx.3dsx ./build/devilutionx.cia From 55aee1ea6ec35f6beec965f172b478a2bdbc2d5e Mon Sep 17 00:00:00 2001 From: Daniel Thamdrup Date: Wed, 7 Feb 2024 22:41:02 +0100 Subject: [PATCH 12/12] separate artifacts Signed-off-by: Daniel Thamdrup --- .github/workflows/3ds.yml | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/.github/workflows/3ds.yml b/.github/workflows/3ds.yml index 72c19658193..8cdcfefa230 100644 --- a/.github/workflows/3ds.yml +++ b/.github/workflows/3ds.yml @@ -58,14 +58,19 @@ jobs: - name: Build DevilutionX run: cmake --build build - - name: Upload Package + - name: Upload 3dsx Package if: ${{ !env.ACT }} uses: actions/upload-artifact@v4 with: - name: devilutionx.3dsx and devilutionx.cia - path: | - ./build/devilutionx.3dsx - ./build/devilutionx.cia + name: devilutionx.3dsx + path: ./build/devilutionx.3dsx + + - name: Upload cia Package + if: ${{ !env.ACT }} + uses: actions/upload-artifact@v4 + with: + name: devilutionx.cia + path: ./build/devilutionx.cia - name: Update Release 3dsx if: ${{ github.event_name == 'release' && !env.ACT }}