diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 87a522c6..55cb1f43 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,7 +15,7 @@ jobs: image: devkitpro/devkita64:20251231 # latest breaks ams building for some reason steps: - - name: Checkout repository and submodules # why are we doing this? I don't think we use submodules but memory doesn't serve so let's keep it + - name: Checkout repository and submodules # needed for hoc-clk uses: actions/checkout@v6.0.2 with: submodules: recursive @@ -42,8 +42,6 @@ jobs: - name: Create compiler shims run: | #I deeply hate this from my heart - set -eux - # aarch64 gcc mv /opt/devkitpro/devkitA64/bin/aarch64-none-elf-gcc /opt/devkitpro/devkitA64/bin/aarch64-none-elf-gcc.real cat > /opt/devkitpro/devkitA64/bin/aarch64-none-elf-gcc <<'EOF' @@ -75,7 +73,8 @@ jobs: exec ccache /opt/devkitpro/devkitARM/bin/arm-none-eabi-g++.real "$@" EOF chmod +x /opt/devkitpro/devkitARM/bin/arm-none-eabi-g++ - echo "PATH=$PWD/.dkp-wrappers:$PATH" >> $GITHUB_ENV + + cat $(which arm-none-eabi-g++) shell: bash - name: Set commit SHA @@ -104,6 +103,7 @@ jobs: key: ccache-${{ runner.os }}-devkitpro-ams-${{ hashFiles('ams_ver.txt') }} # last key was utter garbage, stick to ams versions restore-keys: | ccache-${{ runner.os }}-devkitpro- + save-always: true - name: Configure ccache run: | @@ -185,6 +185,7 @@ jobs: cp "$PATCHES/secmon_define_emc_access_table.inc" "$ROOT/exosphere/program/source/smc/" cp "$PATCHES/secmon_smc_register_access.cpp" "$ROOT/exosphere/program/source/smc/" cp "$PATCHES/secmon_define_soctherm_access_table.inc" "$ROOT/exosphere/program/source/smc/" + cp "$PATCHES/secmon_soctherm_access_table_data.inc" "$ROOT/exosphere/program/source/smc/" # build without ams for now make -j$(($(nproc) * 4))