From 5cfa2e638cc8f29fdb1276d295d79241edde5da4 Mon Sep 17 00:00:00 2001 From: Alexander01998 Date: Sat, 11 Jan 2025 23:46:02 +0100 Subject: [PATCH 1/3] Use 'leadingSpacesToTabs' instead of 'indentWithTabs' in build.gradle --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index ebd0282..b70cdd1 100644 --- a/build.gradle +++ b/build.gradle @@ -120,7 +120,7 @@ spotless { lineEndings("WINDOWS") java { removeUnusedImports() - indentWithTabs() + leadingSpacesToTabs() trimTrailingWhitespace() eclipse().configFile(file("codestyle/formatter.xml")) } From 44177ccfabc379da535ec6c0edf38bd1ee9d4a9f Mon Sep 17 00:00:00 2001 From: Alexander01998 Date: Sun, 12 Jan 2025 21:35:38 +0100 Subject: [PATCH 2/3] Update GHA workflows --- .github/workflows/auto_snapshot_update.yml | 36 ++-- .github/workflows/dependency_graph.yml | 3 +- .github/workflows/gradle.yml | 12 +- .github/workflows/publish.yml | 208 ++++++++++----------- .github/workflows/stale.yml | 56 +++--- 5 files changed, 165 insertions(+), 150 deletions(-) diff --git a/.github/workflows/auto_snapshot_update.yml b/.github/workflows/auto_snapshot_update.yml index 4206daf..44b3862 100644 --- a/.github/workflows/auto_snapshot_update.yml +++ b/.github/workflows/auto_snapshot_update.yml @@ -78,23 +78,24 @@ jobs: git checkout -b $BRANCH_NAME echo "Created and checked out new branch: $BRANCH_NAME" fi - shell: bash - name: Run migrateMappings task run: | ./gradlew migrateMappings --mappings ${{ github.event.inputs.yarn_mappings }} - shell: bash - name: Replace src/main/java with remapped files run: | rm -rf ./src/main/java mv ./remappedSrc ./src/main/java - shell: bash - name: Update version constants run: | - python scripts/update_version_constants.py "${{ github.event.inputs.mc_version }}" "${{ github.event.inputs.yarn_mappings }}" "${{ github.event.inputs.fabric_loader }}" "${{ github.event.inputs.fapi_version }}" "${{ github.event.inputs.cf_game_version }}" - shell: bash + python scripts/update_version_constants.py \ + "${{ github.event.inputs.mc_version }}" \ + "${{ github.event.inputs.yarn_mappings }}" \ + "${{ github.event.inputs.fabric_loader }}" \ + "${{ github.event.inputs.fapi_version }}" \ + "${{ github.event.inputs.cf_game_version }}" # To fix any style issues that the migration scripts might cause - name: Run spotlessApply task @@ -107,13 +108,22 @@ jobs: git add . git commit -m "[Wurst-Bot] Update to ${{ github.event.inputs.mc_version }}" git push --set-upstream origin ${{ github.event.inputs.mc_version }} - shell: bash - # For some reason the commit above doesn't automatically trigger the CI - # workflow, so we need to explicitly start it here. - name: Trigger CI on the new branch - env: - GH_TOKEN: ${{ github.token }} - run: | - gh workflow run gradle.yml --ref ${{ github.event.inputs.mc_version }} - shell: bash + id: ci_dispatch + uses: codex-/return-dispatch@v2 + with: + token: ${{ github.token }} + owner: Wurst-Imperium + repo: WI-Zoom + ref: ${{ github.event.inputs.mc_version }} + workflow: gradle.yml + + - name: Wait for CI to finish (run ${{ steps.ci_dispatch.outputs.run_id }}) + uses: codex-/await-remote-run@v1 + with: + token: ${{ github.token }} + owner: Wurst-Imperium + repo: WI-Zoom + run_id: ${{ steps.ci_dispatch.outputs.run_id }} + run_timeout_seconds: 600 # 10 minutes diff --git a/.github/workflows/dependency_graph.yml b/.github/workflows/dependency_graph.yml index 4d2765b..74a85a2 100644 --- a/.github/workflows/dependency_graph.yml +++ b/.github/workflows/dependency_graph.yml @@ -13,10 +13,11 @@ on: workflow_dispatch: permissions: + # Needed by the dependency-submission action. contents: write jobs: - dependency-submission: + dependency_graph: runs-on: ubuntu-latest steps: diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 46e1b3d..44dde84 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -20,6 +20,10 @@ on: - "gradle**" - "*.gradle" workflow_dispatch: + inputs: + distinct_id: + description: "Automatically set by the return-dispatch action (leave blank if running manually)" + required: false jobs: build: @@ -29,6 +33,9 @@ jobs: IMGUR_CLIENT_ID: ${{ secrets.IMGUR_CLIENT_ID }} steps: + - name: Echo distinct ID ${{ github.event.inputs.distinct_id }} + run: echo ${{ github.event.inputs.distinct_id }} + - name: Checkout repository uses: actions/checkout@v4 @@ -85,7 +92,6 @@ jobs: - name: Add VirusTotal links to build summary if: ${{ env.VIRUSTOTAL_API_KEY && steps.virustotal.outputs.analysis }} - shell: bash run: | echo "
" >> $GITHUB_STEP_SUMMARY echo "🛡️ VirusTotal Scans" >> $GITHUB_STEP_SUMMARY @@ -122,21 +128,17 @@ jobs: echo "
" >> $GITHUB_STEP_SUMMARY echo "📸 Test Screenshots" >> $GITHUB_STEP_SUMMARY echo "" >> $GITHUB_STEP_SUMMARY - for img in run/screenshots/*.png; do if [ -f "$img" ]; then filename=$(basename "$img") name_without_ext="${filename%.*}" - # Upload to Imgur response=$(curl -s -X POST \ -H "Authorization: Client-ID $IMGUR_CLIENT_ID" \ -F "image=@$img" \ https://api.imgur.com/3/image) - # Extract the URL from the response url=$(echo $response | grep -o '"link":"[^"]*"' | cut -d'"' -f4) - if [ ! -z "$url" ]; then # Convert underscores to spaces and capitalize first letter of each word title=$(echo "$name_without_ext" | tr '_' ' ' | awk '{for(i=1;i<=NF;i++)sub(/./,toupper(substr($i,1,1)),$i)}1') diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 495880d..cf8513b 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -54,107 +54,107 @@ jobs: MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }} steps: - - name: Echo distinct ID ${{ github.event.inputs.distinct_id }} - run: echo ${{ github.event.inputs.distinct_id }} - - - name: Checkout repository - uses: actions/checkout@v4 - with: - # Include all tags in case the new tag already exists. - fetch-tags: true - - - name: Set up Java 21 - uses: actions/setup-java@v4 - with: - java-version: "21" - distribution: "microsoft" - - - name: Grant execute permission for gradlew - run: chmod +x gradlew - - - name: Setup Gradle - uses: gradle/actions/setup-gradle@v4 - - - name: Build - run: ./gradlew build --stacktrace --warning-mode=fail - - - name: Create and push tag - run: | - MOD_VERSION=$(grep "^mod_version=" gradle.properties | cut -d'=' -f2 | tr -d ' \r') - git config --global user.name "Wurst-Bot" - git config --global user.email "contact.wurstimperium@gmail.com" - git tag "v$MOD_VERSION" - git push origin "v$MOD_VERSION" - - - name: Close milestone - if: ${{ inputs.close_milestone }} - run: ./gradlew closeMilestone --stacktrace - - - name: Upload backups - if: ${{ inputs.upload_backups }} - run: ./gradlew uploadBackups --stacktrace - - - name: Publish to GitHub - if: ${{ inputs.publish_github }} - env: - GITHUB_TOKEN: ${{ secrets.MCX_PUBLISH_TOKEN }} - run: ./gradlew github --stacktrace - - - name: Publish to CurseForge - if: ${{ inputs.publish_curseforge }} - run: ./gradlew publishCurseforge --stacktrace - - - name: Get CurseForge file ID - id: cf_file_id - if: ${{ inputs.publish_curseforge }} - run: | - file_id=$(./gradlew getCurseforgeId -x publishCurseforge | grep -o 'CURSEFORGE_FILE_ID=[0-9]*' | grep -o '[0-9]*') - echo "file_id=$file_id" >> "$GITHUB_OUTPUT" - echo "CurseForge file ID: \`$file_id\`" >> $GITHUB_STEP_SUMMARY - - - name: Publish to Modrinth - if: ${{ inputs.publish_modrinth }} - run: ./gradlew publishModrinth --stacktrace - - - name: Build website update inputs - id: website_inputs - if: ${{ inputs.update_website && inputs.publish_curseforge }} - run: | - MOD_VERSION=$(grep "^mod_version=" gradle.properties | cut -d'=' -f2 | tr -d ' \r' | sed 's/-MC.*$//') - MC_VERSION=$(grep "^minecraft_version=" gradle.properties | cut -d'=' -f2 | tr -d ' \r') - FAPI_VERSION=$(grep "^fabric_version=" gradle.properties | cut -d'=' -f2 | tr -d ' \r') - JSON_STRING=$(cat << EOF - { - "mod": "wi-zoom", - "modloader": "fabric", - "mod_version": "$MOD_VERSION", - "mc_version": "$MC_VERSION", - "fapi_version": "$FAPI_VERSION", - "file_id": "${{ steps.cf_file_id.outputs.file_id }}" - } - EOF - ) - # Convert to single line and escape quotes - echo "json=${JSON_STRING//$'\n'/}" >> "$GITHUB_OUTPUT" - - - name: Trigger website update - id: website_dispatch - if: ${{ inputs.update_website && inputs.publish_curseforge }} - uses: codex-/return-dispatch@v2 - with: - token: ${{ secrets.WIMODS_NET_PUBLISH_TOKEN }} - owner: Wurst-Imperium - repo: wimods.net - ref: master - workflow: add_mod_port.yml - workflow_inputs: ${{ steps.website_inputs.outputs.json }} - - - name: Wait for website update to finish (run ${{ steps.website_dispatch.outputs.run_id }}) - if: ${{ inputs.update_website && inputs.publish_curseforge }} - uses: codex-/await-remote-run@v1 - with: - token: ${{ secrets.WIMODS_NET_PUBLISH_TOKEN }} - owner: Wurst-Imperium - repo: wimods.net - run_id: ${{ steps.website_dispatch.outputs.run_id }} - run_timeout_seconds: 600 # 10 minutes + - name: Echo distinct ID ${{ github.event.inputs.distinct_id }} + run: echo ${{ github.event.inputs.distinct_id }} + + - name: Checkout repository + uses: actions/checkout@v4 + with: + # Include all tags in case the new tag already exists. + fetch-tags: true + + - name: Set up Java 21 + uses: actions/setup-java@v4 + with: + java-version: "21" + distribution: "microsoft" + + - name: Grant execute permission for gradlew + run: chmod +x gradlew + + - name: Setup Gradle + uses: gradle/actions/setup-gradle@v4 + + - name: Build + run: ./gradlew build --stacktrace --warning-mode=fail + + - name: Create and push tag + run: | + MOD_VERSION=$(grep "^mod_version=" gradle.properties | cut -d'=' -f2 | tr -d ' \r') + git config --global user.name "Wurst-Bot" + git config --global user.email "contact.wurstimperium@gmail.com" + git tag "v$MOD_VERSION" + git push origin "v$MOD_VERSION" + + - name: Close milestone + if: ${{ inputs.close_milestone }} + run: ./gradlew closeMilestone --stacktrace + + - name: Upload backups + if: ${{ inputs.upload_backups }} + run: ./gradlew uploadBackups --stacktrace + + - name: Publish to GitHub + if: ${{ inputs.publish_github }} + env: + GITHUB_TOKEN: ${{ secrets.MCX_PUBLISH_TOKEN }} + run: ./gradlew github --stacktrace + + - name: Publish to CurseForge + if: ${{ inputs.publish_curseforge }} + run: ./gradlew publishCurseforge --stacktrace + + - name: Get CurseForge file ID + id: cf_file_id + if: ${{ inputs.publish_curseforge }} + run: | + file_id=$(./gradlew getCurseforgeId -x publishCurseforge | grep -o 'CURSEFORGE_FILE_ID=[0-9]*' | grep -o '[0-9]*') + echo "file_id=$file_id" >> "$GITHUB_OUTPUT" + echo "CurseForge file ID: \`$file_id\`" >> $GITHUB_STEP_SUMMARY + + - name: Publish to Modrinth + if: ${{ inputs.publish_modrinth }} + run: ./gradlew publishModrinth --stacktrace + + - name: Build website update inputs + id: website_inputs + if: ${{ inputs.update_website && inputs.publish_curseforge }} + run: | + MOD_VERSION=$(grep "^mod_version=" gradle.properties | cut -d'=' -f2 | tr -d ' \r' | sed 's/-MC.*$//') + MC_VERSION=$(grep "^minecraft_version=" gradle.properties | cut -d'=' -f2 | tr -d ' \r') + FAPI_VERSION=$(grep "^fabric_version=" gradle.properties | cut -d'=' -f2 | tr -d ' \r') + JSON_STRING=$(cat << EOF + { + "mod": "wi-zoom", + "modloader": "fabric", + "mod_version": "$MOD_VERSION", + "mc_version": "$MC_VERSION", + "fapi_version": "$FAPI_VERSION", + "file_id": "${{ steps.cf_file_id.outputs.file_id }}" + } + EOF + ) + # Convert to single line and escape quotes + echo "json=${JSON_STRING//$'\n'/}" >> "$GITHUB_OUTPUT" + + - name: Trigger website update + id: website_dispatch + if: ${{ inputs.update_website && inputs.publish_curseforge }} + uses: codex-/return-dispatch@v2 + with: + token: ${{ secrets.WIMODS_NET_PUBLISH_TOKEN }} + owner: Wurst-Imperium + repo: wimods.net + ref: master + workflow: add_mod_port.yml + workflow_inputs: ${{ steps.website_inputs.outputs.json }} + + - name: Wait for website update to finish (run ${{ steps.website_dispatch.outputs.run_id }}) + if: ${{ inputs.update_website && inputs.publish_curseforge }} + uses: codex-/await-remote-run@v1 + with: + token: ${{ secrets.WIMODS_NET_PUBLISH_TOKEN }} + owner: Wurst-Imperium + repo: wimods.net + run_id: ${{ steps.website_dispatch.outputs.run_id }} + run_timeout_seconds: 600 # 10 minutes diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml index e7b27b7..a08ccc8 100644 --- a/.github/workflows/stale.yml +++ b/.github/workflows/stale.yml @@ -5,6 +5,7 @@ on: - cron: "30 1 * * 1-5" permissions: + # Both needed by the stale action. issues: write pull-requests: write @@ -13,30 +14,31 @@ jobs: runs-on: ubuntu-latest steps: - - name: Run stale bot - uses: actions/stale@v9 - with: - stale-issue-message: | - This issue has been open for a while with no recent activity. If this issue is still important to you, please add a comment within the next 7 days to keep it open. Otherwise, the issue will be automatically closed to free up time for other tasks. - - Issues should be closed if: - - They are duplicates of other issues - - There is not enough demand - - They are no longer relevant - - There are not enough details - stale-pr-message: | - This pull request has been open for a while with no recent activity. If you're still working on this or waiting for a review, please add a comment or commit within the next 7 days to keep it open. Otherwise, the pull request will be automatically closed to free up time for other tasks. - - Pull requests should be closed if: - - They have been superseded by another pull request - - They are out of scope or don't align with the project - - They have become obsolete due to other changes - - They have bugs or conflicts that won't be resolved - days-before-stale: 60 - days-before-close: 7 - exempt-issue-labels: "status:never-stale" - exempt-pr-labels: "status:never-stale" - stale-issue-label: "status:stale" - stale-pr-label: "status:stale" - operations-per-run: 30 - enable-statistics: true + - name: Run stale action + uses: actions/stale@v9 + with: + stale-issue-message: | + This issue has been open for a while with no recent activity. If this issue is still important to you, please add a comment within the next 7 days to keep it open. Otherwise, the issue will be automatically closed to free up time for other tasks. + + Issues should be closed if: + - They are duplicates of other issues + - There is not enough demand + - They are no longer relevant + - There are not enough details + stale-pr-message: | + This pull request has been open for a while with no recent activity. If you're still working on this or waiting for a review, please add a comment or commit within the next 7 days to keep it open. Otherwise, the pull request will be automatically closed to free up time for other tasks. + + Pull requests should be closed if: + - They have been superseded by another pull request + - They are out of scope or don't align with the project + - They have become obsolete due to other changes + - They have bugs or conflicts that won't be resolved + days-before-stale: 60 + days-before-close: 7 + exempt-issue-labels: "status:never-stale,status:confirmed" + exempt-pr-labels: "status:never-stale,status:confirmed,status:merged" + exempt-all-milestones: true + stale-issue-label: "status:stale" + stale-pr-label: "status:stale" + operations-per-run: 30 + enable-statistics: true From 7da725e11dcd9320efbbbfdef33828f00694aeb1 Mon Sep 17 00:00:00 2001 From: Alexander01998 Date: Sun, 12 Jan 2025 21:44:56 +0100 Subject: [PATCH 3/3] Fix intentionally_untranslated.json being included in the mod jar --- build.gradle | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build.gradle b/build.gradle index b70cdd1..66640b9 100644 --- a/build.gradle +++ b/build.gradle @@ -113,6 +113,8 @@ jar { from("LICENSE") { rename {"${it}_${base.archivesName.get()}"} } + + exclude("intentionally_untranslated.json") } import com.diffplug.spotless.generic.LicenseHeaderStep