mirror of
https://github.com/DarkMatterCore/nxdumptool.git
synced 2024-11-22 10:16:39 +00:00
workflow: fix issues + remove ccache support
Props to @Whovian9369 for helping me get the workflow to a working state once more. This is only a temporary measure. We don't want any more people with broken nxdumptool builds. We'll reintroduce ccache support at a later time.
This commit is contained in:
parent
34ada96e2f
commit
daacdde44f
2 changed files with 26 additions and 32 deletions
56
.github/workflows/rewrite.yml
vendored
56
.github/workflows/rewrite.yml
vendored
|
@ -32,70 +32,64 @@ jobs:
|
||||||
- name: Set environment variables
|
- name: Set environment variables
|
||||||
run: |
|
run: |
|
||||||
echo "nxdt_commit=${GITHUB_SHA::7}" >> $GITHUB_ENV
|
echo "nxdt_commit=${GITHUB_SHA::7}" >> $GITHUB_ENV
|
||||||
echo "need_node=$(command -v node >/dev/null 2>&1 && echo 0 || echo 1)" >> $GITHUB_ENV
|
|
||||||
|
|
||||||
# Taken from https://github.com/nektos/act/issues/973. Needed when running this workflow locally using Docker + act.
|
|
||||||
- name: Install node (ccache requirement)
|
|
||||||
if: ${{ env.need_node == '1' }}
|
|
||||||
run: |
|
|
||||||
curl -sS https://webi.sh/node | sh
|
|
||||||
echo ~/.local/opt/node/bin >> $GITHUB_PATH
|
|
||||||
|
|
||||||
- name: Clone nxdumptool repository
|
- name: Clone nxdumptool repository
|
||||||
run: |
|
uses: actions/checkout@v4
|
||||||
git clone --recurse-submodules https://github.com/DarkMatterCore/nxdumptool .
|
with:
|
||||||
|
path: nxdumptool
|
||||||
|
submodules: recursive
|
||||||
|
|
||||||
- name: Setup ccache
|
|
||||||
uses: hendrikmuhs/ccache-action@v1.2
|
|
||||||
|
|
||||||
- name: Set workspace permissions
|
|
||||||
run: chmod 777 -R "$GITHUB_WORKSPACE"
|
|
||||||
|
|
||||||
# ccache invocation is handled in the build script.
|
|
||||||
- name: Build nxdumptool-rewrite PoC binary
|
- name: Build nxdumptool-rewrite PoC binary
|
||||||
id: build
|
id: build
|
||||||
continue-on-error: true
|
continue-on-error: true
|
||||||
|
working-directory: nxdumptool
|
||||||
run: |
|
run: |
|
||||||
|
chmod +x ./build.sh
|
||||||
./build.sh --noconfirm
|
./build.sh --noconfirm
|
||||||
|
|
||||||
|
- name: Clone libnx repository
|
||||||
|
if: ${{ steps.build.outcome == 'failure' }}
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
with:
|
||||||
|
repository: switchbrew/libnx
|
||||||
|
path: libnx
|
||||||
|
submodules: recursive
|
||||||
|
|
||||||
- name: Install latest libnx commit and retry build
|
- name: Install latest libnx commit and retry build
|
||||||
id: retry
|
|
||||||
if: ${{ steps.build.outcome == 'failure' }}
|
if: ${{ steps.build.outcome == 'failure' }}
|
||||||
run: |
|
run: |
|
||||||
pushd /tmp
|
cd "$GITHUB_WORKSPACE/libnx"
|
||||||
git clone https://github.com/switchbrew/libnx
|
make install -j8
|
||||||
cd libnx
|
cd "$GITHUB_WORKSPACE/nxdumptool"
|
||||||
make -j8 PREFIX="ccache aarch64-none-elf-"
|
|
||||||
make install
|
|
||||||
popd
|
|
||||||
./build.sh --noconfirm
|
./build.sh --noconfirm
|
||||||
|
|
||||||
- name: Build nxdumptool-rewrite GUI binary
|
- name: Build nxdumptool-rewrite GUI binary
|
||||||
|
working-directory: nxdumptool
|
||||||
run: |
|
run: |
|
||||||
make -j8 PREFIX="ccache aarch64-none-elf-"
|
make -j8
|
||||||
|
|
||||||
- uses: actions/upload-artifact@v4
|
- uses: actions/upload-artifact@v4
|
||||||
with:
|
with:
|
||||||
name: nxdt_rw_poc-${{ env.nxdt_commit }}.nro
|
name: nxdt_rw_poc-${{ env.nxdt_commit }}.nro
|
||||||
path: code_templates/tmp/nxdt_rw_poc.nro
|
path: nxdumptool/code_templates/tmp/nxdt_rw_poc.nro
|
||||||
if-no-files-found: error
|
if-no-files-found: error
|
||||||
|
|
||||||
- uses: actions/upload-artifact@v4
|
- uses: actions/upload-artifact@v4
|
||||||
with:
|
with:
|
||||||
name: nxdt_rw_poc-${{ env.nxdt_commit }}.elf
|
name: nxdt_rw_poc-${{ env.nxdt_commit }}.elf
|
||||||
path: code_templates/tmp/nxdt_rw_poc.elf
|
path: nxdumptool/code_templates/tmp/nxdt_rw_poc.elf
|
||||||
if-no-files-found: error
|
if-no-files-found: error
|
||||||
|
|
||||||
- uses: actions/upload-artifact@v4
|
- uses: actions/upload-artifact@v4
|
||||||
with:
|
with:
|
||||||
name: nxdumptool-rewrite-${{ env.nxdt_commit }}-WIP_UI.nro
|
name: nxdumptool-rewrite-${{ env.nxdt_commit }}-WIP_UI.nro
|
||||||
path: nxdumptool.nro
|
path: nxdumptool/nxdumptool.nro
|
||||||
if-no-files-found: error
|
if-no-files-found: error
|
||||||
|
|
||||||
- uses: actions/upload-artifact@v4
|
- uses: actions/upload-artifact@v4
|
||||||
with:
|
with:
|
||||||
name: nxdumptool-rewrite-${{ env.nxdt_commit }}-WIP_UI.elf
|
name: nxdumptool-rewrite-${{ env.nxdt_commit }}-WIP_UI.elf
|
||||||
path: nxdumptool.elf
|
path: nxdumptool/nxdumptool.elf
|
||||||
if-no-files-found: error
|
if-no-files-found: error
|
||||||
|
|
||||||
- name: Upload artifact to prerelease
|
- name: Upload artifact to prerelease
|
||||||
|
@ -113,6 +107,6 @@ jobs:
|
||||||
omitBody: True
|
omitBody: True
|
||||||
omitBodyDuringUpdate: True
|
omitBodyDuringUpdate: True
|
||||||
omitNameDuringUpdate: True
|
omitNameDuringUpdate: True
|
||||||
artifacts: "code_templates/tmp/nxdt_rw_poc.*"
|
artifacts: "nxdumptool/code_templates/tmp/nxdt_rw_poc.*"
|
||||||
#artifacts: "code_templates/tmp/nxdt_rw_poc.*, nxdumptool.*"
|
#artifacts: "nxdumptool/code_templates/tmp/nxdt_rw_poc.*, nxdumptool/nxdumptool.*"
|
||||||
token: ${{ secrets.GITHUB_TOKEN }}
|
token: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
|
2
build.sh
2
build.sh
|
@ -25,7 +25,7 @@ set -e
|
||||||
if [ ${ARG,,} != "--noconfirm" ]; then
|
if [ ${ARG,,} != "--noconfirm" ]; then
|
||||||
make BUILD_TYPE="$poc_name" -j$(nproc)
|
make BUILD_TYPE="$poc_name" -j$(nproc)
|
||||||
else
|
else
|
||||||
make BUILD_TYPE="$poc_name" -j8 PREFIX="ccache aarch64-none-elf-"
|
make BUILD_TYPE="$poc_name" -j8
|
||||||
fi
|
fi
|
||||||
|
|
||||||
set +e
|
set +e
|
||||||
|
|
Loading…
Reference in a new issue