Merge pull request #1186 from apache/fix-tests

Prep for release

Author: matrei

.github/scripts/releaseDistributions.sh

@@ -19,26 +19,33 @@
 #  under the License.
 #
 
-# ./releaseDistributions.sh <tag> <username> <password>
+# ./releaseDistributions.sh <tag> <username> <svn_folder>
 
 set -euo pipefail
 
 if [[ $# -ne 3 ]]; then
-  echo "Usage: $0 <tag> <username> <password>" >&2
+  echo "Usage: $0 <tag> <svn_folder> <username>" >&2
   exit 1
 fi
 
 RELEASE_TAG="$1"
 RELEASE_VERSION="${RELEASE_TAG#v}"
-SVN_USER="$2"
-SVN_PASS="$3"
-RELEASE_ROOT="https://dist.apache.org/repos/dist/release/grails/spring-security"
-DEV_ROOT="https://dist.apache.org/repos/dist/dev/grails/spring-security"
+SVN_FOLDER="$2"
+SVN_USER="$3"
+RELEASE_ROOT="https://dist.apache.org/repos/dist/release/grails/${SVN_FOLDER}"
+DEV_ROOT="https://dist.apache.org/repos/dist/dev/grails/${SVN_FOLDER}"
+
+read -r -s -p "Password: " SVN_PASS
+echo
 
 if [[ -z "${RELEASE_TAG}" ]]; then
   echo "❌ ERROR: Release Tag must not be empty." >&2
   exit 1
 fi
+if [[ -z "${SVN_FOLDER}" ]]; then
+  echo "❌ ERROR: SVN folder name must not be empty." >&2
+  exit 1
+fi
 if [[ -z "${SVN_USER}" ]]; then
   echo "❌ ERROR: Username must not be empty." >&2
   exit 1

.github/scripts/releaseJarFiles.sh

@@ -19,19 +19,20 @@
 #  under the License.
 #
 
-# ./releaseJarFiles.sh <staging repo description> <username> <password>
+# ./releaseJarFiles.sh <staging repo description> <username>
 
 set -euo pipefail
 
-if [[ $# -ne 3 ]]; then
-  echo "Usage: $0 <staging repo description> <username> <password>" >&2
+if [[ $# -ne 2 ]]; then
+  echo "Usage: $0 <staging repo description> <username>" >&2
   exit 1
 fi
 
 NEXUS_URL="https://repository.apache.org"
 STAGING_DESCRIPTION="$1"
 NEXUS_USER="$2"
-NEXUS_PASS="$3"
+read -r -s -p "Password: " NEXUS_PASS
+echo
 
 if [[ -z "${STAGING_DESCRIPTION}" ]]; then
   echo "ERROR: Staging Description must not be empty." >&2

.github/vote_templates/announce.txt

@@ -1,19 +1,19 @@
-The Apache Grails community is pleased to announce the release of Apache Grails Spring Security Plugin ${VERSION}.
+The Apache Grails community is pleased to announce the release of ${PROJECT_NAME} ${VERSION}.
 
-Grails is a powerful Groovy-based web application framework for the JVM built on top of Spring Boot that has many plugins to further extend its functionality.
+${PROJECT_DESC}
 
-This Grails Spring Security Plugin release is another milestone on our journey to a final 7.0 release. Users are encouraged to try the milestone to provide early feedback. 
+More information can be found here: https://apache.github.io/${REPO_NAME}/
 
 The release notes are available here:
-https://github.com/apache/grails-spring-security/releases/tag/v${VERSION}
+https://github.com/${REPO_SLUG}/releases/tag/${TAG}
 
 Apache Grails website: https://grails.apache.org/
 
 Download Links: https://grails.apache.org/download.html
 
 Grails Resources:
-- Grails Spring Security GitHub repo: https://github.com/apache/grails-spring-security
-- Issues: https://github.com/apache/grails-spring-security/issues
+- ${PROJECT_NAME} GitHub repo: https://github.com/${REPO_SLUG}
+- Issues: https://github.com/${REPO_SLUG}/issues
 - Mailing lists: https://grails.apache.org/community.html
 
 Happy Coding,

.github/vote_templates/staged.txt

@@ -1,21 +1,21 @@
 Hi Everyone,
 
-I am happy to start the VOTE thread for an Apache Grails Spring Security Plugin release of version ${VERSION}!
+I am happy to start the VOTE thread for an ${PROJECT_NAME} release of version ${VERSION}!
 
 Release notes for the release are here:
-https://github.com/apache/grails-spring-security/releases/tag/v${VERSION}
+https://github.com/${REPO_SLUG}/releases/tag/${TAG}
 
 The tag for this release is:
-https://github.com/apache/grails-spring-security/releases/tag/v${VERSION}
-Tag commit id: ${VERSION_COMMIT_ID}
+https://github.com/${REPO_SLUG}/releases/tag/${TAG}
+Tag commit id: ${SHA}
 
 The artifacts to be voted on are located as follows (r${DIST_SVN_REVISION}):
-Source release: https://dist.apache.org/repos/dist/dev/grails/spring-security/${VERSION}/sources
+Source release: https://dist.apache.org/repos/dist/dev/grails/${SVN_FOLDER}/${VERSION}/sources
 
 Release artifacts are signed with a key from the following file:
 https://dist.apache.org/repos/dist/release/grails/KEYS
 
-Please vote on releasing this package as: Apache Grails Spring Security Plugin ${VERSION}.
+Please vote on releasing this package as: ${PROJECT_NAME} ${VERSION}.
 
 Reminder on ASF release approval requirements for PMC members:
 https://www.apache.org/legal/release-policy.html#release-approval
@@ -26,9 +26,9 @@ https://www.apache.org/info/verification.html
 The vote is open for a minimum of 72 hours and passes if a majority of at least
 three +1 PMC votes are cast.
 
-[ ] +1 Release Apache Grails Spring Security Plugin ${VERSION}
+[ ] +1 Release ${PROJECT_NAME} ${VERSION}
 [ ]  0 I don't have a strong opinion about this, but I assume it's ok
-[ ] -1 Do not release Apache Grails Spring Security Plugin ${VERSION} because...
+[ ] -1 Do not release ${PROJECT_NAME} ${VERSION} because...
 
 Here is my vote:
 

.github/vote_templates/vote_succeeded.txt

@@ -0,0 +1,12 @@
+The vote has passed with <X> +1 binding votes and <Y> +1 additional votes.
+
+<IF NEW EMAIL>
+Vote thread: <VOTE THREAD PERMALINK>
+</IF NEW EMAIL>
+
+I'll proceed with the release and announce it shortly.
+
+Thanks to everyone who participated in the vote!
+
+Regards
+<NAME>

.github/workflows/gradle.yml

@@ -44,7 +44,13 @@ jobs:
         with:
           develocity-access-key: ${{ secrets.GRAILS_DEVELOCITY_ACCESS_KEY }}
       - name: "🏃‍♂️ Run Tests"
-        run: ./gradlew check --max-workers=2 --refresh-dependencies --continue
+        run: >
+          ./gradlew
+          check
+          --max-workers=2
+          --refresh-dependencies
+          --continue
+          -PgebAtCheckWaiting
   functionalTests:
     if: ${{ !contains(github.event.head_commit.message, '[skip tests]') }}
     runs-on: ubuntu-24.04
@@ -65,7 +71,11 @@ jobs:
         with:
           develocity-access-key: ${{ secrets.GRAILS_DEVELOCITY_ACCESS_KEY }}
       - name: "🏃‍♂️ Run Different Config Functional Tests"
-        run: ./gradlew core-examples-functional-test-app:check -DTESTCONFIG=${{ matrix.test-config }}
+        run: >
+          ./gradlew
+          core-examples-functional-test-app:check
+          -DTESTCONFIG=${{ matrix.test-config }}
+          -PgebAtCheckWaiting
   publish:
     needs: [ coreTests, functionalTests ]
     if: ${{ always() && github.repository_owner == 'apache' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch') && (needs.coreTests.result == 'success' || needs.coreTests.result == 'skipped') && (needs.functionalTests.result == 'success' || needs.functionalTests.result == 'skipped') }}