diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 048a681e..4b13b6f4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -46,7 +46,7 @@ jobs: - { name: 'iOS', os: 'macos-15', generator: 'Xcode', dx5: false, config: false, brew: true, werror: true, clang-tidy: false, cmake-args: '-DCMAKE_SYSTEM_NAME=iOS', ios: true } - { name: 'Emscripten', os: 'ubuntu-latest', generator: 'Ninja', dx5: false, config: false, emsdk: true, werror: true, clang-tidy: false, cmake-wrapper: 'emcmake' } - { name: 'Nintendo 3DS', os: 'ubuntu-latest', generator: 'Ninja', dx5: false, config: false, n3ds: true, werror: true, clang-tidy: false, container: 'devkitpro/devkitarm:latest', cmake-args: '-DCMAKE_TOOLCHAIN_FILE=/opt/devkitpro/cmake/3DS.cmake' } - - { name: 'Nintendo Wii U', os: 'ubuntu-latest', generator: 'Ninja', dx5: false, config: false, wiiu: true, werror: false, clang-tidy: false, container: 'devkitpro/devkitppc:latest', cmake-args: '-DCMAKE_TOOLCHAIN_FILE=/opt/devkitpro/cmake/WiiU.cmake' } + - { name: 'Nintendo Wii U', os: 'ubuntu-latest', generator: 'Ninja', dx5: false, config: false, wiiu: true, werror: false, clang-tidy: false, container: 'devkitpro/devkitppc:latest', cmake-args: '-DCMAKE_TOOLCHAIN_FILE=/opt/devkitpro/cmake/WiiU.cmake' } - { name: 'Xbox One', os: 'windows-latest', generator: 'Visual Studio 17 2022', dx5: false, config: false, msvc: true, werror: false, clang-tidy: false, vc-arch: 'amd64', cmake-args: '-DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION=10.0.26100.0', xbox-one: true} - { name: 'Android', os: 'ubuntu-latest', generator: 'Ninja', dx5: false, config: false, android: true, werror: true, clang-tidy: false,} steps: @@ -225,11 +225,10 @@ jobs: - name: Package (Wii U) if: ${{ matrix.wiiu }} run: | - cd build - mkdir dist - mv *.rpx ../isle-portable/packaging/wiiu/ - mv ../isle-portable/packaging/wiiu/ dist/ - cd dist + mkdir -p build/dist + mv build/*.rpx isle-portable/packaging/wiiu/ + mv isle-portable/packaging/wiiu/ dist/ + cd build/dist mv wiiu isle-U - name: Package (Android)