diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 696ee5a3f..beaf692d3 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -47,6 +47,9 @@ jobs: build-windows: needs: generate-port-o2r runs-on: windows-2022 + strategy: + matrix: + config: [Release, Debug] steps: - uses: actions/checkout@v4 with: @@ -55,62 +58,34 @@ jobs: submodules: recursive - name: Build run: | - cmake -S . -B "build/x64" -G "Visual Studio 17 2022" -T v143 -A x64 -DCMAKE_BUILD_TYPE=Release - cmake --build ./build/x64 --config Release --parallel 10 + cmake -S . -B "build/x64" -G "Visual Studio 17 2022" -T v143 -A x64 -DCMAKE_BUILD_TYPE=${{ matrix.config }} + cmake --build ./build/x64 --config ${{ matrix.config }} --parallel 10 - name: Download spaghetti.o2r uses: actions/download-artifact@v4 with: name: spaghetti.o2r - path: ./build/x64/Release + path: ./build/x64/${{ matrix.config }} - name: Create Package run: | - mkdir spaghetti-release - mv build/x64/Release/Spaghettify.exe spaghetti-release/ - mv build/x64/Release/spaghetti.o2r spaghetti-release/ - mv config.yml spaghetti-release/ - mv yamls spaghetti-release/ - Invoke-WebRequest -Uri "https://raw.githubusercontent.com/mdqinc/SDL_GameControllerDB/master/gamecontrollerdb.txt" -OutFile "spaghetti-release/gamecontrollerdb.txt" + mkdir spaghetti-${{ matrix.config }} + mv build/x64/${{ matrix.config }}/Spaghettify.exe spaghetti-${{ matrix.config }}/ + mv build/x64/${{ matrix.config }}/spaghetti.o2r spaghetti-${{ matrix.config }}/ + mv config.yml spaghetti-${{ matrix.config }}/ + mv yamls spaghetti-${{ matrix.config }}/ + Invoke-WebRequest -Uri "https://raw.githubusercontent.com/mdqinc/SDL_GameControllerDB/master/gamecontrollerdb.txt" -OutFile "spaghetti-${{ matrix.config }}/gamecontrollerdb.txt" - name: Upload build + if: matrix.config == 'Release' uses: actions/upload-artifact@v4 with: name: spaghetti-windows - path: spaghetti-release - - build-windows-debug: - needs: generate-port-o2r - runs-on: windows-2022 - steps: - - uses: actions/checkout@v4 - with: - fetch-depth: 0 - fetch-tags: true - submodules: recursive - - name: Build - run: | - cmake -S . -B "build/x64" -G "Visual Studio 17 2022" -T v143 -A x64 -DCMAKE_BUILD_TYPE=Debug - cmake --build ./build/x64 --config Debug --parallel 10 - - name: Download spaghetti.o2r - uses: actions/download-artifact@v4 - with: - name: spaghetti.o2r - path: ./build/x64/Release - - name: Create Package - run: | - mkdir spaghetti-release - mv build/x64/Release/Spaghettify.exe spaghetti-release/ - mv build/x64/Release/spaghetti.o2r spaghetti-release/ - mv config.yml spaghetti-release/ - mv yamls spaghetti-release/ - Invoke-WebRequest -Uri "https://raw.githubusercontent.com/mdqinc/SDL_GameControllerDB/master/gamecontrollerdb.txt" -OutFile "spaghetti-release/gamecontrollerdb.txt" - - name: Upload build - uses: actions/upload-artifact@v4 - with: - name: spaghetti-windows - path: spaghetti-release + path: spaghetti-${{ matrix.config }} build-macos: needs: generate-port-o2r runs-on: macOS-latest + strategy: + matrix: + config: [Release, Debug] steps: - uses: actions/checkout@v4 with: @@ -125,8 +100,8 @@ jobs: vcpkgDirectory: '${{ github.workspace }}/vcpkg' - name: Build run: | - cmake -H. -Bbuild-cmake -GNinja -DCMAKE_POLICY_VERSION_MINIMUM=3.5 -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake - cmake --build build-cmake --config Release -j3 + cmake -H. -Bbuild-cmake -GNinja -DCMAKE_POLICY_VERSION_MINIMUM=3.5 -DCMAKE_BUILD_TYPE=${{ matrix.config }} -DCMAKE_TOOLCHAIN_FILE=${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake + cmake --build build-cmake --config ${{ matrix.config }} -j3 - name: Download spaghetti.o2r uses: actions/download-artifact@v4 with: @@ -134,59 +109,25 @@ jobs: path: ./build-cmake - name: Create Package run: | - mkdir spaghetti-release - mv build-cmake/Spaghettify spaghetti-release/ - mv build-cmake/spaghetti.o2r spaghetti-release/ - mv config.yml spaghetti-release/ - mv yamls spaghetti-release/ - wget -O spaghetti-release/gamecontrollerdb.txt https://raw.githubusercontent.com/mdqinc/SDL_GameControllerDB/master/gamecontrollerdb.txt + mkdir spaghetti-${{ matrix.config }} + mv build-cmake/Spaghettify spaghetti-${{ matrix.config }}/ + mv build-cmake/spaghetti.o2r spaghetti-${{ matrix.config }}/ + mv config.yml spaghetti-${{ matrix.config }}/ + mv yamls spaghetti-${{ matrix.config }}/ + wget -O spaghetti-${{ matrix.config }}/gamecontrollerdb.txt https://raw.githubusercontent.com/mdqinc/SDL_GameControllerDB/master/gamecontrollerdb.txt - name: Publish packaged artifacts + if: matrix.config == 'Release' uses: actions/upload-artifact@v4 with: name: spaghetti-mac-x64 - path: spaghetti-release - - build-macos-debug: - needs: generate-port-o2r - runs-on: macOS-latest - steps: - - uses: actions/checkout@v4 - with: - fetch-depth: 0 - fetch-tags: true - submodules: recursive - - name: Install dependencies - run: brew install ninja cmake - - name: Install vcpkg - uses: lukka/run-vcpkg@v11.5 - with: - vcpkgDirectory: '${{ github.workspace }}/vcpkg' - - name: Build - run: | - cmake -H. -Bbuild-cmake -GNinja -DCMAKE_POLICY_VERSION_MINIMUM=3.5 -DCMAKE_BUILD_TYPE=Debug -DCMAKE_TOOLCHAIN_FILE=${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake - cmake --build build-cmake --config Debug -j3 - - name: Download spaghetti.o2r - uses: actions/download-artifact@v4 - with: - name: spaghetti.o2r - path: ./build-cmake - - name: Create Package - run: | - mkdir spaghetti-release - mv build-cmake/Spaghettify spaghetti-release/ - mv build-cmake/spaghetti.o2r spaghetti-release/ - mv config.yml spaghetti-release/ - mv yamls spaghetti-release/ - wget -O spaghetti-release/gamecontrollerdb.txt https://raw.githubusercontent.com/mdqinc/SDL_GameControllerDB/master/gamecontrollerdb.txt - - name: Publish packaged artifacts - uses: actions/upload-artifact@v4 - with: - name: spaghetti-mac-x64 - path: spaghetti-release + path: spaghetti-${{ matrix.config }} build-linux: needs: generate-port-o2r runs-on: ubuntu-latest + strategy: + matrix: + config: [Release, Debug] steps: - uses: actions/checkout@v4 with: @@ -259,25 +200,19 @@ jobs: path: ./build-cmake - name: Build run: | - cmake -H. -Bbuild-cmake -GNinja -DCMAKE_BUILD_TYPE=Release - cmake --build build-cmake --config Release -j3 + cmake -H. -Bbuild-cmake -GNinja -DCMAKE_BUILD_TYPE=${{ matrix.config }} + cmake --build build-cmake --config ${{ matrix.config }} -j3 (cd build-cmake && cpack -G External) wget -O gamecontrollerdb.txt https://raw.githubusercontent.com/mdqinc/SDL_GameControllerDB/master/gamecontrollerdb.txt mv README.md readme.txt mv build-cmake/*.appimage spaghetti.appimage - # - name: Upload build - # uses: actions/upload-artifact@v4 - # with: - # name: Spaghettify-linux - # path: | - # spaghetti.appimage - # config.yml - # yamls - # gamecontrollerdb.txt build-linux-old: needs: generate-port-o2r runs-on: ubuntu-22.04 + strategy: + matrix: + config: [Release, Debug] steps: - uses: actions/checkout@v4 with: @@ -362,119 +297,17 @@ jobs: path: ./build-cmake - name: Build run: | - cmake -H. -Bbuild-cmake -GNinja -DCMAKE_BUILD_TYPE=Release - cmake --build build-cmake --config Release -j3 + cmake -H. -Bbuild-cmake -GNinja -DCMAKE_BUILD_TYPE=${{ matrix.config }} + cmake --build build-cmake --config ${{ matrix.config }} -j3 (cd build-cmake && cpack -G External) wget -O gamecontrollerdb.txt https://raw.githubusercontent.com/mdqinc/SDL_GameControllerDB/master/gamecontrollerdb.txt mv README.md readme.txt mv build-cmake/*.appimage spaghetti.appimage - name: Upload build + if: matrix.config == 'Release' uses: actions/upload-artifact@v4 with: - name: Spaghettify-linux - path: | - spaghetti.appimage - config.yml - yamls - gamecontrollerdb.txt - - build-linux-old-debug: - needs: generate-port-o2r - runs-on: ubuntu-22.04 - steps: - - uses: actions/checkout@v4 - with: - fetch-depth: 0 - fetch-tags: true - submodules: recursive - - name: Update machine - run: sudo apt update - - name: Install dependencies - run: sudo apt-get install gcc g++ git cmake ninja-build lsb-release libsdl2-dev libsdl2-net-dev libpng-dev libsdl2-net-dev libzip-dev zipcmp zipmerge ziptool nlohmann-json3-dev libtinyxml2-dev libspdlog-dev libboost-dev libopengl-dev libogg-dev libvorbis-dev - - name: ccache - uses: hendrikmuhs/ccache-action@v1.2.14 - with: - key: linux-old-ccache-${{ github.ref }}-${{ github.sha }} - restore-keys: | - linux-old-ccache-${{ github.ref }} - linux-old-ccache- - - name: Cache build folders - uses: actions/cache@v4 - with: - key: linux-old-build-${{ github.ref }}-${{ github.sha }} - restore-keys: | - linux-build-old-${{ github.ref }} - linux-build-old- - path: | - SDL2-2.30.3 - tinyxml2-10.0.0 - libzip-1.10.1 - - name: Install latest SDL - run: | - export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH" - if [ ! -d "SDL2-2.30.3" ]; then - wget https://www.libsdl.org/release/SDL2-2.30.3.tar.gz - tar -xzf SDL2-2.30.3.tar.gz - fi - cd SDL2-2.30.3 - ./configure --enable-hidapi-libusb - make -j 10 - sudo make install - sudo cp -av /usr/local/lib/libSDL* /lib/x86_64-linux-gnu/ - - name: Install latest SDL_net - run: | - export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH" - if [ ! -d "SDL2_net-2.2.0" ]; then - wget https://www.libsdl.org/projects/SDL_net/release/SDL2_net-2.2.0.tar.gz - tar -xzf SDL2_net-2.2.0.tar.gz - fi - cd SDL2_net-2.2.0 - ./configure - make -j 10 - sudo make install - sudo cp -av /usr/local/lib/libSDL* /lib/x86_64-linux-gnu/ - - name: Install latest tinyxml2 - run: | - export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH" - wget https://github.com/leethomason/tinyxml2/archive/refs/tags/10.0.0.tar.gz - tar -xzf 10.0.0.tar.gz - cd tinyxml2-10.0.0 - mkdir -p build - cd build - cmake .. - make - sudo make install - - name: Install libzip without crypto - run: | - export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH" - if [ ! -d "libzip-1.10.1" ]; then - wget https://github.com/nih-at/libzip/releases/download/v1.10.1/libzip-1.10.1.tar.gz - tar -xzf libzip-1.10.1.tar.gz - fi - cd libzip-1.10.1 - mkdir -p build - cd build - cmake .. -DENABLE_COMMONCRYPTO=OFF -DENABLE_GNUTLS=OFF -DENABLE_MBEDTLS=OFF -DENABLE_OPENSSL=OFF - make - sudo make install - sudo cp -av /usr/local/lib/libzip* /lib/x86_64-linux-gnu/ - - name: Download spaghetti.o2r - uses: actions/download-artifact@v4 - with: - name: spaghetti.o2r - path: ./build-cmake - - name: Build - run: | - cmake -H. -Bbuild-cmake -GNinja -DCMAKE_BUILD_TYPE=Debug - cmake --build build-cmake --config Debug -j3 - (cd build-cmake && cpack -G External) - wget -O gamecontrollerdb.txt https://raw.githubusercontent.com/mdqinc/SDL_GameControllerDB/master/gamecontrollerdb.txt - mv README.md readme.txt - mv build-cmake/*.appimage spaghetti.appimage - - name: Upload build - uses: actions/upload-artifact@v4 - with: - name: Spaghettify-linux + name: spaghetti-linux-x64 path: | spaghetti.appimage config.yml @@ -484,6 +317,9 @@ jobs: build-linux-docker: needs: generate-port-o2r runs-on: ubuntu-22.04 + strategy: + matrix: + config: [Release, Debug] steps: - uses: actions/checkout@v4 with: @@ -500,13 +336,16 @@ jobs: if: steps.cache.outputs.cache-hit != 'true' run: docker build . -t spaghetti - name: Confiure - run: docker run --rm -v ${PWD}:/project spaghetti cmake -H. -Bbuild-cmake -GNinja -DCMAKE_BUILD_TYPE=Release + run: docker run --rm -v ${PWD}:/project spaghetti cmake -H. -Bbuild-cmake -GNinja -DCMAKE_BUILD_TYPE=${{ matrix.config }} - name: Build spaghetti - run: docker run --rm -v ${PWD}:/project spaghetti cmake --build build-cmake --config Release -j$(nproc) + run: docker run --rm -v ${PWD}:/project spaghetti cmake --build build-cmake --config ${{ matrix.config }} -j$(nproc) build-switch: needs: generate-port-o2r runs-on: ubuntu-latest + strategy: + matrix: + config: [Release, Debug] container: image: devkitpro/devkita64:20241023 steps: @@ -534,57 +373,13 @@ jobs: make sudo make install cd ../.. - # cmake -H. -Bbuild-switch -GNinja -DCMAKE_TOOLCHAIN_FILE=/opt/devkitpro/cmake/Switch.cmake -DCMAKE_BUILD_TYPE=Release - cmake --build build-switch --config Release -j3 - wget -O gamecontrollerdb.txt https://raw.githubusercontent.com/mdqinc/SDL_GameControllerDB/master/gamecontrollerdb.txt - mv README.md readme.txt - mv build-switch/*.nro Spaghettify.nro - - name: Upload build - uses: actions/upload-artifact@v4 - with: - name: Spaghettify-switch - path: | - Spaghettify.nro - config.yml - assets - gamecontrollerdb.txt - - build-switch-debug: - needs: generate-port-o2r - runs-on: ubuntu-latest - container: - image: devkitpro/devkita64:20241023 - steps: - - uses: actions/checkout@v4 - with: - fetch-depth: 0 - fetch-tags: true - submodules: recursive - - name: Install dependencies - run: | - sudo apt-get update - sudo apt-get install -y ninja-build - sudo apt-get remove -y cmake - git -C libultraship remote add nx https://github.com/Net64DD/libultraship.git - git -C libultraship fetch nx - git -C libultraship checkout nx/main-nx - wget https://github.com/Kitware/CMake/releases/download/v3.28.3/cmake-3.28.3-linux-x86_64.sh -O /tmp/cmake.sh - sudo sh /tmp/cmake.sh --prefix=/usr/local/ --exclude-subdir - wget https://github.com/leethomason/tinyxml2/archive/refs/tags/10.0.0.tar.gz - tar -xzf 10.0.0.tar.gz - cd tinyxml2-10.0.0 - mkdir build - cd build - cmake -H.. -B. -DCMAKE_TOOLCHAIN_FILE=/opt/devkitpro/cmake/Switch.cmake - make - sudo make install - cd ../.. - cmake -H. -Bbuild-switch -GNinja -DCMAKE_TOOLCHAIN_FILE=/opt/devkitpro/cmake/Switch.cmake -DCMAKE_BUILD_TYPE=Debug - cmake --build build-switch --config Debug -j3 + # cmake -H. -Bbuild-switch -GNinja -DCMAKE_TOOLCHAIN_FILE=/opt/devkitpro/cmake/Switch.cmake -DCMAKE_BUILD_TYPE=${{ matrix.config }} + cmake --build build-switch --config ${{ matrix.config }} -j3 wget -O gamecontrollerdb.txt https://raw.githubusercontent.com/mdqinc/SDL_GameControllerDB/master/gamecontrollerdb.txt mv README.md readme.txt mv build-switch/*.nro Spaghettify.nro - name: Upload build + if: matrix.config == 'Release' uses: actions/upload-artifact@v4 with: name: Spaghettify-switch