From 15697dcf71376e6c5aa9167e10790149772858b8 Mon Sep 17 00:00:00 2001 From: Maschell Date: Sat, 7 Jan 2023 10:20:21 +0100 Subject: [PATCH 1/3] Update Dockerfile to use the latest WUMS version, add dependency to FunctionPatcherModule --- Dockerfile | 4 ++-- src/main.cpp | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index b866654..8ff31b4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ -FROM wiiuenv/devkitppc:20220917 +FROM wiiuenv/devkitppc:20221228 COPY --from=wiiuenv/libfunctionpatcher:20220904 /artifacts $DEVKITPRO -COPY --from=wiiuenv/wiiumodulesystem:20220904 /artifacts $DEVKITPRO +COPY --from=wiiuenv/wiiumodulesystem:20230106 /artifacts $DEVKITPRO COPY --from=wiiuenv/libromfs_wiiu:20220904 /artifacts $DEVKITPRO COPY --from=wiiuenv/libcontentredirection:20221010 /artifacts $DEVKITPRO diff --git a/src/main.cpp b/src/main.cpp index 018e214..9a3c16f 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -8,6 +8,7 @@ WUMS_MODULE_EXPORT_NAME("homebrew_content_redirection"); WUMS_USE_WUT_DEVOPTAB(); +WUMS_DEPENDS_ON(homebrew_functionpatcher); #define VERSION "v0.2.3" From 6d32b25002f71bdb4b1e87896d8e92a8e9c0649c Mon Sep 17 00:00:00 2001 From: Maschell Date: Sat, 7 Jan 2023 10:21:34 +0100 Subject: [PATCH 2/3] Update CI to use actions/checkout@v3 --- .github/workflows/ci.yml | 4 ++-- .github/workflows/pr.yml | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8793eb6..343fc23 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,7 +9,7 @@ jobs: clang-format: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: clang-format run: | docker run --rm -v ${PWD}:/src wiiuenv/clang-format:13.0.0-2 -r ./src @@ -17,7 +17,7 @@ jobs: runs-on: ubuntu-22.04 needs: clang-format steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: create version.h run: | git_hash=$(git rev-parse --short "$GITHUB_SHA") diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 50188ff..92da63d 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -6,7 +6,7 @@ jobs: clang-format: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: clang-format run: | docker run --rm -v ${PWD}:/src wiiuenv/clang-format:13.0.0-2 -r ./src @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-22.04 needs: clang-format steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: build binary with logging run: | docker build . -t builder @@ -25,7 +25,7 @@ jobs: runs-on: ubuntu-22.04 needs: clang-format steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: create version.h run: | git_hash=$(git rev-parse --short "${{ github.event.pull_request.head.sha }}") From 13d7f092f542d44d099daf0623ce2000043f9c0c Mon Sep 17 00:00:00 2001 From: Maschell Date: Sat, 7 Jan 2023 10:22:13 +0100 Subject: [PATCH 3/3] Update the CI to use a non-deprecated release action --- .github/workflows/ci.yml | 24 +++++------------------- 1 file changed, 5 insertions(+), 19 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 343fc23..2160a69 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -42,32 +42,18 @@ jobs: run: | echo REPOSITORY_NAME=$(echo "$GITHUB_REPOSITORY" | awk -F / '{print $2}' | sed -e "s/:refs//") >> $GITHUB_ENV echo DATETIME=$(echo $(date '+%Y%m%d-%H%M%S')) >> $GITHUB_ENV - echo COMMIT_MESSAGES=$(echo "${{join(github.event.commits.*.message, '||END||') }}" | sed -e 's/||END||/\r\n/g') >> $GITHUB_ENV - uses: actions/download-artifact@master with: name: binary - name: zip artifact run: zip -r ${{ env.REPOSITORY_NAME }}_${{ env.DATETIME }}.zip *.wms - name: Create Release - id: create_release - uses: actions/create-release@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + uses: "softprops/action-gh-release@v1" with: tag_name: ${{ env.REPOSITORY_NAME }}-${{ env.DATETIME }} - release_name: Nightly-${{ env.REPOSITORY_NAME }}-${{ env.DATETIME }} draft: false prerelease: true - body: | - Not a stable release: - ${{ env.COMMIT_MESSAGES }} - - name: Upload Release Asset - id: upload-release-asset - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps - asset_path: ./${{ env.REPOSITORY_NAME }}_${{ env.DATETIME }}.zip - asset_name: ${{ env.REPOSITORY_NAME }}_${{ env.DATETIME }}.zip - asset_content_type: application/zip \ No newline at end of file + generate_release_notes: true + name: Nightly-${{ env.REPOSITORY_NAME }}-${{ env.DATETIME }} + files: | + ./${{ env.REPOSITORY_NAME }}_${{ env.DATETIME }}.zip \ No newline at end of file