From 557bb4c50ba7181005080d9461d2eaaf4603c106 Mon Sep 17 00:00:00 2001 From: JohnBraham Date: Fri, 11 Sep 2026 16:58:16 +0100 Subject: [PATCH] Separate release clean and build phases --- .github/workflows/deploy-release.yml | 14 +++++++++----- .../moddev/mc/mineralogy/WorkflowContractTest.java | 3 +++ 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/.github/workflows/deploy-release.yml b/.github/workflows/deploy-release.yml index 0c8df5223..b411aef4a 100644 --- a/.github/workflows/deploy-release.yml +++ b/.github/workflows/deploy-release.yml @@ -362,12 +362,16 @@ jobs: - name: Build, test, and audit once run: | chmod +x ./gradlew - ./gradlew clean check build javadoc verifyReleaseDependencies verifyReleaseArtifacts writeReleaseChecksums \ - -PorespawnVerificationRepository="${{ steps.orespawn.outputs.repository }}" \ - --no-daemon --stacktrace \ - -Dorg.gradle.java.installations.paths="${{ steps.java-paths.outputs.paths }}" \ - -Dorg.gradle.java.installations.auto-detect=false \ + gradle_args=( + -PorespawnVerificationRepository="${{ steps.orespawn.outputs.repository }}" + --no-daemon --stacktrace + -Dorg.gradle.java.installations.paths="${{ steps.java-paths.outputs.paths }}" + -Dorg.gradle.java.installations.auto-detect=false -Dorg.gradle.java.installations.auto-download=false + ) + ./gradlew clean "${gradle_args[@]}" + ./gradlew check build javadoc verifyReleaseDependencies verifyReleaseArtifacts writeReleaseChecksums \ + "${gradle_args[@]}" - name: Stage the immutable release artifact id: artifact diff --git a/src/test/java/zone/moddev/mc/mineralogy/WorkflowContractTest.java b/src/test/java/zone/moddev/mc/mineralogy/WorkflowContractTest.java index 672c29164..320ac6e01 100644 --- a/src/test/java/zone/moddev/mc/mineralogy/WorkflowContractTest.java +++ b/src/test/java/zone/moddev/mc/mineralogy/WorkflowContractTest.java @@ -104,6 +104,9 @@ public void dispatcherProtectsPublishedVersionsAndUsesOneOrderedBundle() throws assertTrue(deploy.contains("version-type: ${{ inputs.curseforge_release_level }}")); assertTrue(deploy.contains("github-prerelease: false")); assertTrue(deploy.contains("version-type: release")); + assertFalse(deploy.contains("./gradlew clean check build")); + assertTrue(deploy.contains("./gradlew clean \"${gradle_args[@]}\"")); + assertTrue(deploy.contains("./gradlew check build javadoc verifyReleaseDependencies")); assertEquals(2, countOccurrences(deploy, "bash gradle/stage-orespawn-release.sh")); assertTrue(deploy.contains("-PorespawnVerificationRepository=\"${{ steps.orespawn.outputs.repository }}\""));