diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml index 327987d..e81ec92 100644 --- a/.github/workflows/validate.yml +++ b/.github/workflows/validate.yml @@ -96,97 +96,95 @@ jobs: - name: Prepare Archive run: | mv cmake-build/BanjoRecompiled BanjoRecompiled - rm -rf assets/scss tar -czf BanjoRecompiled.tar.gz BanjoRecompiled assets/ recompcontrollerdb.txt - name: Archive BanjoRecomp uses: actions/upload-artifact@v4 with: name: BanjoRecompiled-${{ runner.os }}-X64-${{ matrix.type }} path: BanjoRecompiled.tar.gz - build-linux-arm64: - runs-on: ubuntu-22.04-arm - strategy: - matrix: - type: [ Debug, Release ] - os: [ ubuntu-22.04 ] - name: ${{ matrix.os }} (arm64, ${{ matrix.type }}, Native) - steps: - - name: Checkout - uses: actions/checkout@v4 - with: - ref: ${{ github.event.pull_request.head.sha || github.ref }} - submodules: recursive - - name: ccache - uses: hendrikmuhs/ccache-action@v1.2 - with: - key: ${{ matrix.os }}-banjo-ccache-${{ matrix.type }}-arm64-${{ inputs.N64RECOMP_COMMIT }} - - name: Install Linux Dependencies - run: | - sudo apt-get update - sudo apt-get install -y ninja-build libgtk-3-dev lld llvm clang-15 libfuse2 - - # Install SDL2 - echo ::group::install SDL2 - - # Enable ccache - export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH" - - wget https://github.com/libsdl-org/SDL/releases/download/release-${{ inputs.SDL2_VERSION }}/SDL2-${{ inputs.SDL2_VERSION }}.tar.gz - tar -xzf SDL2-${{ inputs.SDL2_VERSION }}.tar.gz - cd SDL2-${{ inputs.SDL2_VERSION }} - ./configure - make -j 10 - sudo make install - sudo cp -av /usr/local/lib/libSDL* /lib/aarch64-linux-gnu/ - echo ::endgroup:: - - name: Get extra dependencies - uses: actions/checkout@v4 - with: - repository: ${{ secrets.SECRET_NAME }} - token: ${{ secrets.SECRET_TOKEN }} - path: extra - - name: Build N64Recomp & RSPRecomp - run: | - git clone https://github.com/Mr-Wiseguy/N64Recomp.git --recurse-submodules N64RecompSource - cd N64RecompSource - git checkout ${{ inputs.N64RECOMP_COMMIT }} - git submodule update --init --recursive - - # enable ccache - export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH" - - # Build N64Recomp & RSPRecomp - cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER=g++-11 -DCMAKE_C_COMPILER=gcc-11 -DCMAKE_MAKE_PROGRAM=ninja -G Ninja -S . -B cmake-build - cmake --build cmake-build --config Release --target N64RecompCLI -j $(nproc) - cmake --build cmake-build --config Release --target RSPRecomp -j $(nproc) - - # Copy N64Recomp & RSPRecomp to root directory - cp cmake-build/N64Recomp .. - cp cmake-build/RSPRecomp .. - - name: Run N64Recomp & RSPRecomp - run: | - # Copy extra dependencies to root directory - cp extra/* . - - ./N64Recomp banjo.us.rev0.toml - ./RSPRecomp n_aspMain.us.rev0.toml - - name: Build BanjoRecomp - run: |- - # enable ccache - export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH" - - cmake -DCMAKE_BUILD_TYPE=${{ matrix.type }} -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER=clang++-15 -DCMAKE_C_COMPILER=clang-15 -DCMAKE_MAKE_PROGRAM=ninja -G Ninja -S . -B cmake-build - cmake --build cmake-build --config ${{ matrix.type }} --target BanjoRecompiled -j $(nproc) - - name: Prepare Archive - run: | - mv cmake-build/BanjoRecompiled BanjoRecompiled - rm -rf assets/scss - tar -czf BanjoRecompiled.tar.gz BanjoRecompiled assets/ recompcontrollerdb.txt - - name: Archive BanjoRecomp - uses: actions/upload-artifact@v4 - with: - name: BanjoRecompiled-${{ runner.os }}-ARM64-${{ matrix.type }} - path: BanjoRecompiled.tar.gz +# build-linux-arm64: +# runs-on: ubuntu-22.04-arm +# strategy: +# matrix: +# type: [ Debug, Release ] +# os: [ ubuntu-22.04 ] +# name: ${{ matrix.os }} (arm64, ${{ matrix.type }}, Native) +# steps: +# - name: Checkout +# uses: actions/checkout@v4 +# with: +# ref: ${{ github.event.pull_request.head.sha || github.ref }} +# submodules: recursive +# - name: ccache +# uses: hendrikmuhs/ccache-action@v1.2 +# with: +# key: ${{ matrix.os }}-banjo-ccache-${{ matrix.type }}-arm64-${{ inputs.N64RECOMP_COMMIT }} +# - name: Install Linux Dependencies +# run: | +# sudo apt-get update +# sudo apt-get install -y ninja-build libgtk-3-dev lld llvm clang-15 libfuse2 +# +# # Install SDL2 +# echo ::group::install SDL2 +# +# # Enable ccache +# export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH" +# +# wget https://github.com/libsdl-org/SDL/releases/download/release-${{ inputs.SDL2_VERSION }}/SDL2-${{ inputs.SDL2_VERSION }}.tar.gz +# tar -xzf SDL2-${{ inputs.SDL2_VERSION }}.tar.gz +# cd SDL2-${{ inputs.SDL2_VERSION }} +# ./configure +# make -j 10 +# sudo make install +# sudo cp -av /usr/local/lib/libSDL* /lib/aarch64-linux-gnu/ +# echo ::endgroup:: +# - name: Get extra dependencies +# uses: actions/checkout@v4 +# with: +# repository: ${{ secrets.SECRET_NAME }} +# token: ${{ secrets.SECRET_TOKEN }} +# path: extra +# - name: Build N64Recomp & RSPRecomp +# run: | +# git clone https://github.com/Mr-Wiseguy/N64Recomp.git --recurse-submodules N64RecompSource +# cd N64RecompSource +# git checkout ${{ inputs.N64RECOMP_COMMIT }} +# git submodule update --init --recursive +# +# # enable ccache +# export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH" +# +# # Build N64Recomp & RSPRecomp +# cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER=g++-11 -DCMAKE_C_COMPILER=gcc-11 -DCMAKE_MAKE_PROGRAM=ninja -G Ninja -S . -B cmake-build +# cmake --build cmake-build --config Release --target N64RecompCLI -j $(nproc) +# cmake --build cmake-build --config Release --target RSPRecomp -j $(nproc) +# +# # Copy N64Recomp & RSPRecomp to root directory +# cp cmake-build/N64Recomp .. +# cp cmake-build/RSPRecomp .. +# - name: Run N64Recomp & RSPRecomp +# run: | +# # Copy extra dependencies to root directory +# cp extra/* . +# +# ./N64Recomp banjo.us.rev0.toml +# ./RSPRecomp n_aspMain.us.rev0.toml +# - name: Build BanjoRecomp +# run: |- +# # enable ccache +# export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH" +# +# cmake -DCMAKE_BUILD_TYPE=${{ matrix.type }} -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER=clang++-15 -DCMAKE_C_COMPILER=clang-15 -DCMAKE_MAKE_PROGRAM=ninja -G Ninja -S . -B cmake-build +# cmake --build cmake-build --config ${{ matrix.type }} --target BanjoRecompiled -j $(nproc) +# - name: Prepare Archive +# run: | +# mv cmake-build/BanjoRecompiled BanjoRecompiled +# tar -czf BanjoRecompiled.tar.gz BanjoRecompiled assets/ recompcontrollerdb.txt +# - name: Archive BanjoRecomp +# uses: actions/upload-artifact@v4 +# with: +# name: BanjoRecompiled-${{ runner.os }}-ARM64-${{ matrix.type }} +# path: BanjoRecompiled.tar.gz build-linux-flatpak: runs-on: ubuntu-latest env: @@ -320,7 +318,6 @@ jobs: Move-Item -Path "cmake-build/dxil.dll" -Destination "dxil.dll" Move-Item -Path "cmake-build/SDL2.dll" -Destination "SDL2.dll" Move-Item -Path "cmake-build/BanjoRecompiled.pdb" -Destination "BanjoRecompiled.pdb" - Remove-Item -Path "assets/scss" -Recurse -Force - name: Archive BanjoRecomp uses: actions/upload-artifact@v4 with: