[skip ci] remove pre release workflow

jdaugherty · jdaugherty · commit 3214c6d06097 · 2024-12-19T19:10:39.000-05:00
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -9,23 +9,13 @@ on:
   workflow_dispatch:
 jobs:
   build:
-    outputs:
-      found_skip_publish: ${{ steps.check_prevent_property.outputs.value }}
     runs-on: ubuntu-latest
     permissions:
       contents: read
       packages: read
     steps:
       - name: "📥 Checkout the repository"
         uses: actions/checkout@v4
-      - name: "🔍 Check if we should skip publish"
-        id: check_prevent_property
-        run: |
-          if grep -q '^preventSnapshotPublish=true' gradle.properties; then
-            echo "value=true" >> $GITHUB_OUTPUT
-          else
-            echo "value=false" >> $GITHUB_OUTPUT
-          fi
       - name: "☕️ Setup JDK"
         uses: actions/setup-java@v4
         with:
@@ -47,7 +37,7 @@ jobs:
           name: grails-gsp-SNAPSHOT.zip
           path: ./**/build/libs/*
   publish:
-    if: github.event_name == 'push' && needs.build.outputs.found_skip_publish != 'true'
+    if: github.event_name == 'push'
     needs: build
     runs-on: ubuntu-latest
     permissions:
@@ -72,7 +62,7 @@ jobs:
           ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
         run: ./gradlew publish
   docs:
-    if: github.event_name == 'push' && needs.build.outputs.found_skip_publish != 'true'
+    if: github.event_name == 'push'
     needs: build
     runs-on: ubuntu-latest
     permissions:
diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -12,80 +12,10 @@ jobs:
     runs-on: ubuntu-latest
     permissions:
       contents: read
-      packages: write
+      packages: read
     steps:
-      - name: "💥 Purge Existing Builds - org.grails.grails-gsp"
-        run: |
-          curl -L \
-          -X DELETE \
-          -H "Accept: application/vnd.github+json" \
-          -H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" \
-          -H "X-GitHub-Api-Version: 2022-11-28" \
-          https://api.github.com/orgs/${{ github.repository_owner }}/packages/maven/org.grails.grails-gsp || true
-      - name: "💥 Purge Existing Builds - org.grails.grails-taglib"
-        run: |
-          curl -L \
-          -X DELETE \
-          -H "Accept: application/vnd.github+json" \
-          -H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" \
-          -H "X-GitHub-Api-Version: 2022-11-28" \
-          https://api.github.com/orgs/grails/packages/maven/org.grails.grails-taglib || true
-      - name: "💥 Purge Existing Builds - org.grails.grails-web-gsp-taglib"
-        run: |
-          curl -L \
-          -X DELETE \
-          -H "Accept: application/vnd.github+json" \
-          -H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" \
-          -H "X-GitHub-Api-Version: 2022-11-28" \
-          https://api.github.com/orgs/${{ github.repository_owner }}/packages/maven/org.grails.grails-web-gsp-taglib || true
-      - name: "💥 Purge Existing Builds - org.grails.grails-web-jsp"
-        run: |
-          curl -L \
-          -X DELETE \
-          -H "Accept: application/vnd.github+json" \
-          -H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" \
-          -H "X-GitHub-Api-Version: 2022-11-28" \
-          https://api.github.com/orgs/${{ github.repository_owner }}/packages/maven/org.grails.grails-web-jsp || true
-      - name: "💥 Purge Existing Builds - org.grails.grails-web-gsp"
-        run: |
-          curl -L \
-          -X DELETE \
-          -H "Accept: application/vnd.github+json" \
-          -H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" \
-          -H "X-GitHub-Api-Version: 2022-11-28" \
-          https://api.github.com/orgs/${{ github.repository_owner }}/packages/maven/org.grails.grails-web-gsp || true
-      - name: "💥 Purge Existing Builds - org.grails.grails-web-taglib"
-        run: |
-          curl -L \
-          -X DELETE \
-          -H "Accept: application/vnd.github+json" \
-          -H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" \
-          -H "X-GitHub-Api-Version: 2022-11-28" \
-          https://api.github.com/orgs/${{ github.repository_owner }}/packages/maven/org.grails.grails-web-taglib || true
-      - name: "💥 Purge Existing Builds - org.grails.plugins.gsp"
-        run: |
-          curl -L \
-          -X DELETE \
-          -H "Accept: application/vnd.github+json" \
-          -H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" \
-          -H "X-GitHub-Api-Version: 2022-11-28" \
-          https://api.github.com/orgs/${{ github.repository_owner }}/packages/maven/org.grails.plugins.gsp || true
       - name: Checkout repository
         uses: actions/checkout@v4
-      - name: "⎌ Revert Prevent Snapshot Publishing Flag"
-        run: |
-          sed -i "s/^preventSnapshotPublish.*$/preventSnapshotPublish\=false/" gradle.properties
-      - name: "📩 Commit flag to allow snapshot publishing"
-        run: |
-          git config user.name "${{ env.GIT_USER_NAME }}"
-          git config user.email "${{ env.GIT_USER_EMAIL }}"
-          git add gradle.properties
-          if ! git diff --cached --quiet; then
-            git commit -m "[skip ci] Restore Snapshot Publishing"
-            git push origin HEAD
-          else
-            echo "Publishing already enabled."
-          fi
       - name: "☕️ Setup JDK"
         uses: actions/setup-java@v4
         with:
diff --git a/build.gradle b/build.gradle
@@ -13,9 +13,8 @@ buildscript {
 
 ext {
     isCiBuild = System.getenv().get("TRAVIS") == 'true' || (System.getenv().get("CI") as Boolean)
-    isGitHubRepoPublish = System.getenv("GITHUB_PUBLISH") == 'true'
-    isGrailsRepoPublish = project.projectVersion.endsWith('-SNAPSHOT') && !isGitHubRepoPublish
-    isReleaseVersion = !isGrailsRepoPublish && !isGitHubRepoPublish
+    isSnapshot = project.projectVersion.endsWith('-SNAPSHOT')
+    isReleaseVersion = !isSnapshot
 }
 
 group = "org.grails"
@@ -218,35 +217,21 @@ subprojects { subproject ->
         tasks.findByName("assemble").finalizedBy(sourcesJar, javadocJar)
 
         publishing {
-            if (isGrailsRepoPublish || isGitHubRepoPublish) {
+            if (isSnapshot) {
                 repositories {
                     maven {
                         credentials {
-                            if(isGrailsRepoPublish) {
                                 def u = System.getenv('ARTIFACTORY_USERNAME') ?: project.findProperty('artifactoryPublishUsername') ?: ''
                                 def p = System.getenv('ARTIFACTORY_PASSWORD') ?: project.findProperty('artifactoryPublishPassword') ?: ''
                                 username = u
                                 password = p
                             }
-                            else {
-                                def u = System.getenv('GITHUB_USERNAME') ?: ''
-                                def p = System.getenv('GITHUB_PASSWORD') ?: ''
-                                username = u
-                                password = p
-                            }
-                        }
-
-                        if(isGrailsRepoPublish) {
                             if (isGrailsPlugin) {
                                 url "https://repo.grails.org/grails/plugins3-snapshots-local"
                             } else {
                                 url "https://repo.grails.org/grails/libs-snapshots-local"
                             }
                         }
-                        else {
-                            url 'https://maven.pkg.github.com/grails/grails-gsp'
-                        }
-                    }
                 }
             }
 
@@ -283,23 +268,21 @@ subprojects { subproject ->
 
         subproject.afterEvaluate {
             signing {
-                required { isReleaseVersion || isGitHubRepoPublish }
+                required { isReleaseVersion }
                 sign publishing.publications.maven
             }
         }
 
         tasks.withType(Sign) {
-            onlyIf { isReleaseVersion || isGitHubRepoPublish }
+            onlyIf { isReleaseVersion }
         }
 
         //do not generate extra load on Nexus with new staging repository if signing fails
-        if(isReleaseVersion) {
             tasks.withType(io.github.gradlenexus.publishplugin.InitializeNexusStagingRepository).configureEach {
                 shouldRunAfter(tasks.withType(Sign))
             }
         }
     }
-}
 
 def DOCUMENTATION_GROUP = 'Documentation'
 
diff --git a/gradle.properties b/gradle.properties
@@ -25,7 +25,3 @@ junit-jupiter.version=5.8.0
 org.gradle.caching=true
 org.gradle.parallel=true
 org.gradle.daemon=true
-
-# Set when we are temporarily releasing, should be false unless we want to prevent
-# snapshot or documentation publishes.
-preventSnapshotPublish=true

Original file line number	Diff line number	Diff line change
`@@ -13,9 +13,8 @@ buildscript {`
`13`	`13`
`14`	`14`	`ext {`
`15`	`15`	`isCiBuild = System.getenv().get("TRAVIS") == 'true' \|\| (System.getenv().get("CI") as Boolean)`
`16`		`- isGitHubRepoPublish = System.getenv("GITHUB_PUBLISH") == 'true'`
`17`		`- isGrailsRepoPublish = project.projectVersion.endsWith('-SNAPSHOT') && !isGitHubRepoPublish`
`18`		`- isReleaseVersion = !isGrailsRepoPublish && !isGitHubRepoPublish`
	`16`	`+ isSnapshot = project.projectVersion.endsWith('-SNAPSHOT')`
	`17`	`+ isReleaseVersion = !isSnapshot`
`19`	`18`	`}`
`20`	`19`
`21`	`20`	`group = "org.grails"`
`@@ -218,35 +217,21 @@ subprojects { subproject ->`
`218`	`217`	`tasks.findByName("assemble").finalizedBy(sourcesJar, javadocJar)`
`219`	`218`
`220`	`219`	`publishing {`
`221`		`- if (isGrailsRepoPublish \|\| isGitHubRepoPublish) {`
	`220`	`+ if (isSnapshot) {`
`222`	`221`	`repositories {`
`223`	`222`	`maven {`
`224`	`223`	`credentials {`
`225`		`- if(isGrailsRepoPublish) {`
`226`	`224`	`def u = System.getenv('ARTIFACTORY_USERNAME') ?: project.findProperty('artifactoryPublishUsername') ?: ''`
`227`	`225`	`def p = System.getenv('ARTIFACTORY_PASSWORD') ?: project.findProperty('artifactoryPublishPassword') ?: ''`
`228`	`226`	`username = u`
`229`	`227`	`password = p`
`230`	`228`	`}`
`231`		`- else {`
`232`		`- def u = System.getenv('GITHUB_USERNAME') ?: ''`
`233`		`- def p = System.getenv('GITHUB_PASSWORD') ?: ''`
`234`		`- username = u`
`235`		`- password = p`
`236`		`- }`
`237`		`- }`
`238`		`-`
`239`		`- if(isGrailsRepoPublish) {`
`240`	`229`	`if (isGrailsPlugin) {`
`241`	`230`	`url "https://repo.grails.org/grails/plugins3-snapshots-local"`
`242`	`231`	`} else {`
`243`	`232`	`url "https://repo.grails.org/grails/libs-snapshots-local"`
`244`	`233`	`}`
`245`	`234`	`}`
`246`		`- else {`
`247`		`- url 'https://maven.pkg.github.com/grails/grails-gsp'`
`248`		`- }`
`249`		`- }`
`250`	`235`	`}`
`251`	`236`	`}`
`252`	`237`
`@@ -283,23 +268,21 @@ subprojects { subproject ->`
`283`	`268`
`284`	`269`	`subproject.afterEvaluate {`
`285`	`270`	`signing {`
`286`		`- required { isReleaseVersion \|\| isGitHubRepoPublish }`
	`271`	`+ required { isReleaseVersion }`
`287`	`272`	`sign publishing.publications.maven`
`288`	`273`	`}`
`289`	`274`	`}`
`290`	`275`
`291`	`276`	`tasks.withType(Sign) {`
`292`		`- onlyIf { isReleaseVersion \|\| isGitHubRepoPublish }`
	`277`	`+ onlyIf { isReleaseVersion }`
`293`	`278`	`}`
`294`	`279`
`295`	`280`	`//do not generate extra load on Nexus with new staging repository if signing fails`
`296`		`- if(isReleaseVersion) {`
`297`	`281`	`tasks.withType(io.github.gradlenexus.publishplugin.InitializeNexusStagingRepository).configureEach {`
`298`	`282`	`shouldRunAfter(tasks.withType(Sign))`
`299`	`283`	`}`
`300`	`284`	`}`
`301`	`285`	`}`
`302`		`-}`
`303`	`286`
`304`	`287`	`def DOCUMENTATION_GROUP = 'Documentation'`
`305`	`288`