Skip to content

Commit 5471264

Browse files
jamesfredleyjamesfredley
committed
Merge branch '7.1.x' into 7.2.x
2 parents e706d19 + 725fa7c commit 5471264

117 files changed

Lines changed: 3386 additions & 1503 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/scripts/releaseDistributions.sh‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -58,15 +58,19 @@ svn_exists() {
5858
svn ls "${svn_flags[@]}" --depth=empty "${url}" >/dev/null 2>&1
5959
}
6060

61-
old_release_folder="$(svn ls "${svn_flags[@]}" "${RELEASE_ROOT}" | awk -F/ 'NF{print $1; exit}')"
62-
if [[ -n "${old_release_folder}" ]]; then
63-
PRIOR_RELEASE_URL="${RELEASE_ROOT}/${old_release_folder}"
64-
echo "🗑️ Deleting old release folder: ${PRIOR_RELEASE_URL}"
65-
svn rm "${svn_flags[@]}" -m "Remove previous release ${old_release_folder}" "${PRIOR_RELEASE_URL}"
66-
echo "✅ Deleted old release folder"
67-
else
68-
echo "ℹ️ No existing release subfolder found under ${RELEASE_ROOT}"
69-
fi
61+
for folder in $(svn ls "${svn_flags[@]}" "${RELEASE_ROOT}"); do
62+
folder=$(echo "$folder" | sed 's|/$||')
63+
[[ "${folder}" == "${RELEASE_VERSION}" ]] && continue
64+
PRIOR_RELEASE_URL="${RELEASE_ROOT}/${folder}"
65+
read -r -p "Remove old release folder '${folder}' at ${PRIOR_RELEASE_URL}? [y/N] " confirm < /dev/tty
66+
if [[ "${confirm}" =~ ^[Yy](es)?$ ]]; then
67+
echo "🗑️ Deleting old release folder: ${PRIOR_RELEASE_URL}"
68+
svn rm "${svn_flags[@]}" -m "Remove previous release ${folder}" "${PRIOR_RELEASE_URL}"
69+
echo "✅ Deleted old release folder"
70+
else
71+
echo "⏭️ Skipping removal of old release folder: ${PRIOR_RELEASE_URL}"
72+
fi
73+
done
7074

7175
DEV_VERSION_URL="$DEV_ROOT/${RELEASE_VERSION}"
7276
RELEASE_VERSION_URL="$RELEASE_ROOT/${RELEASE_VERSION}"

‎.github/workflows/codestyle.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,12 @@ jobs:
4141
- name: "🐘 Setup Gradle"
4242
uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
4343
with:
44-
develocity-access-key: ${{ secrets.GRAILS_DEVELOCITY_ACCESS_KEY }}
44+
develocity-access-key: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
4545
- name: "🔎 Check Core Projects"
4646
run: ./gradlew codeStyle
4747
- name: "📤 Upload Failure Reports"
4848
if: always()
49-
uses: actions/upload-artifact@v7.0.0
49+
uses: actions/upload-artifact@v7.0.1
5050
with:
5151
name: core-reports
5252
path: build/reports/codestyle/
@@ -78,13 +78,13 @@ jobs:
7878
- name: "🐘 Setup Gradle"
7979
uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
8080
with:
81-
develocity-access-key: ${{ secrets.GRAILS_DEVELOCITY_ACCESS_KEY }}
81+
develocity-access-key: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
8282
- name: "🔎 Check Gradle Plugin Projects"
8383
working-directory: grails-gradle
8484
run: ./gradlew codeStyle
8585
- name: "📤 Upload Failure Reports"
8686
if: always()
87-
uses: actions/upload-artifact@v7.0.0
87+
uses: actions/upload-artifact@v7.0.1
8888
with:
8989
name: gradle-plugin-reports
9090
path: grails-gradle/build/reports/codestyle/
@@ -116,13 +116,13 @@ jobs:
116116
- name: "🐘 Setup Gradle"
117117
uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
118118
with:
119-
develocity-access-key: ${{ secrets.GRAILS_DEVELOCITY_ACCESS_KEY }}
119+
develocity-access-key: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
120120
- name: "🔎 Check Forge Projects"
121121
working-directory: grails-forge
122122
run: ./gradlew codeStyle
123123
- name: "📤 Upload Failure Reports"
124124
if: always()
125-
uses: actions/upload-artifact@v7.0.0
125+
uses: actions/upload-artifact@v7.0.1
126126
with:
127127
name: forge-reports
128128
path: grails-forge/build/reports/codestyle/

‎.github/workflows/forge-deploy-next.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
- name: "🐘 Setup Gradle"
3232
uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
3333
with:
34-
develocity-access-key: ${{ secrets.GRAILS_DEVELOCITY_ACCESS_KEY }}
34+
develocity-access-key: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
3535
- name: "🔍 Setup TestLens"
3636
uses: testlens-app/setup-testlens@v1
3737
- name: "🔨 Build"
@@ -56,7 +56,7 @@ jobs:
5656
- name: "🐘 Setup Gradle"
5757
uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
5858
with:
59-
develocity-access-key: ${{ secrets.GRAILS_DEVELOCITY_ACCESS_KEY }}
59+
develocity-access-key: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
6060
- name: "🔍 Setup TestLens"
6161
uses: testlens-app/setup-testlens@v1
6262
- name: "🔑 Login to Google Cloud"
@@ -117,7 +117,7 @@ jobs:
117117
- name: "🐘 Setup Gradle"
118118
uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
119119
with:
120-
develocity-access-key: ${{ secrets.GRAILS_DEVELOCITY_ACCESS_KEY }}
120+
develocity-access-key: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
121121
- name: "🔍 Setup TestLens"
122122
uses: testlens-app/setup-testlens@v1
123123
- name: "🔑 Login to Google Cloud"

‎.github/workflows/forge-deploy-prev-snapshot.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
- name: "🐘 Setup Gradle"
3232
uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
3333
with:
34-
develocity-access-key: ${{ secrets.GRAILS_DEVELOCITY_ACCESS_KEY }}
34+
develocity-access-key: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
3535
- name: "🔍 Setup TestLens"
3636
uses: testlens-app/setup-testlens@v1
3737
- name: "🔨 Build"
@@ -56,7 +56,7 @@ jobs:
5656
- name: "🐘 Setup Gradle"
5757
uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
5858
with:
59-
develocity-access-key: ${{ secrets.GRAILS_DEVELOCITY_ACCESS_KEY }}
59+
develocity-access-key: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
6060
- name: "🔍 Setup TestLens"
6161
uses: testlens-app/setup-testlens@v1
6262
- name: "🔑 Login to Google Cloud"
@@ -117,7 +117,7 @@ jobs:
117117
- name: "🐘 Setup Gradle"
118118
uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
119119
with:
120-
develocity-access-key: ${{ secrets.GRAILS_DEVELOCITY_ACCESS_KEY }}
120+
develocity-access-key: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
121121
- name: "🔍 Setup TestLens"
122122
uses: testlens-app/setup-testlens@v1
123123
- name: "🔑 Login to Google Cloud"

‎.github/workflows/forge-deploy-prev.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
- name: "🐘 Setup Gradle"
3232
uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
3333
with:
34-
develocity-access-key: ${{ secrets.GRAILS_DEVELOCITY_ACCESS_KEY }}
34+
develocity-access-key: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
3535
- name: "🔍 Setup TestLens"
3636
uses: testlens-app/setup-testlens@v1
3737
- name: "🔨 Build"
@@ -56,7 +56,7 @@ jobs:
5656
- name: "🐘 Setup Gradle"
5757
uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
5858
with:
59-
develocity-access-key: ${{ secrets.GRAILS_DEVELOCITY_ACCESS_KEY }}
59+
develocity-access-key: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
6060
- name: "🔍 Setup TestLens"
6161
uses: testlens-app/setup-testlens@v1
6262
- name: "🔑 Login to Google Cloud"
@@ -117,7 +117,7 @@ jobs:
117117
- name: "🐘 Setup Gradle"
118118
uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
119119
with:
120-
develocity-access-key: ${{ secrets.GRAILS_DEVELOCITY_ACCESS_KEY }}
120+
develocity-access-key: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
121121
- name: "🔍 Setup TestLens"
122122
uses: testlens-app/setup-testlens@v1
123123
- name: "🔑 Login to Google Cloud"

‎.github/workflows/forge-deploy-release.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
- name: "🐘 Setup Gradle"
3838
uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
3939
with:
40-
develocity-access-key: ${{ secrets.GRAILS_DEVELOCITY_ACCESS_KEY }}
40+
develocity-access-key: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
4141
- name: "🔍 Setup TestLens"
4242
uses: testlens-app/setup-testlens@v1
4343
- name: "🧩 Assemble"
@@ -60,7 +60,7 @@ jobs:
6060
- name: "🐘 Setup Gradle"
6161
uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
6262
with:
63-
develocity-access-key: ${{ secrets.GRAILS_DEVELOCITY_ACCESS_KEY }}
63+
develocity-access-key: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
6464
- name: "🔍 Setup TestLens"
6565
uses: testlens-app/setup-testlens@v1
6666
- name: "🔑 Login to Google Cloud"
@@ -119,7 +119,7 @@ jobs:
119119
- name: "🐘 Setup Gradle"
120120
uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
121121
with:
122-
develocity-access-key: ${{ secrets.GRAILS_DEVELOCITY_ACCESS_KEY }}
122+
develocity-access-key: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
123123
- name: "🔍 Setup TestLens"
124124
uses: testlens-app/setup-testlens@v1
125125
- name: "🔑 Login to Google Cloud"

‎.github/workflows/forge-deploy-snapshot.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
- name: "🐘 Setup Gradle"
3232
uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
3333
with:
34-
develocity-access-key: ${{ secrets.GRAILS_DEVELOCITY_ACCESS_KEY }}
34+
develocity-access-key: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
3535
- name: "🔍 Setup TestLens"
3636
uses: testlens-app/setup-testlens@v1
3737
- name: "🔨 Build"
@@ -56,7 +56,7 @@ jobs:
5656
- name: "🐘 Setup Gradle"
5757
uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
5858
with:
59-
develocity-access-key: ${{ secrets.GRAILS_DEVELOCITY_ACCESS_KEY }}
59+
develocity-access-key: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
6060
- name: "🔍 Setup TestLens"
6161
uses: testlens-app/setup-testlens@v1
6262
- name: "🔑 Login to Google Cloud"
@@ -115,7 +115,7 @@ jobs:
115115
- name: "🐘 Setup Gradle"
116116
uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
117117
with:
118-
develocity-access-key: ${{ secrets.GRAILS_DEVELOCITY_ACCESS_KEY }}
118+
develocity-access-key: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
119119
- name: "🔍 Setup TestLens"
120120
uses: testlens-app/setup-testlens@v1
121121
- name: "🔑 Login to Google Cloud"

0 commit comments

Comments
 (0)