Skip to content

Commit

Permalink
Merge branch '7.0.x' into renovate/alpine-3.x
Browse files Browse the repository at this point in the history
  • Loading branch information
jamesfredley authored Dec 27, 2024
2 parents ffbdf95 + af002df commit 395d02f
Show file tree
Hide file tree
Showing 84 changed files with 2,146 additions and 838 deletions.
15 changes: 15 additions & 0 deletions .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# These are supported funding model platforms

github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
patreon: # Replace with a single Patreon username
open_collective: friends-of-grails
ko_fi: # Replace with a single Ko-fi username
tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
liberapay: # Replace with a single Liberapay username
issuehunt: # Replace with a single IssueHunt username
lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
polar: # Replace with a single Polar username
buy_me_a_coffee: # Replace with a single Buy Me a Coffee username
thanks_dev: # Replace with a single thanks.dev username
custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']
4 changes: 0 additions & 4 deletions .github/actions/post-release/entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,6 @@ if [ -z "$SNAPSHOT_SUFFIX" ]; then
SNAPSHOT_SUFFIX="-SNAPSHOT"
fi

if [ -n "$MICRONAUT_BUILD_EMAIL" ]; then
GIT_USER_EMAIL=$MICRONAUT_BUILD_EMAIL
fi

if [ -z "$GIT_USER_EMAIL" ]; then
GIT_USER_EMAIL="${GITHUB_ACTOR}@users.noreply.github.com"
fi
Expand Down
4 changes: 0 additions & 4 deletions .github/actions/pre-release/entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,6 @@ echo -n "Determining release version: "
release_version=${GITHUB_REF:11}
echo $release_version

if [ -n "$MICRONAUT_BUILD_EMAIL" ]; then
GIT_USER_EMAIL=$MICRONAUT_BUILD_EMAIL
fi

if [ -z "$GIT_USER_NAME" ]; then
GIT_USER_NAME="grails-build"
fi
Expand Down
34 changes: 5 additions & 29 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,45 +1,21 @@
version: 2
updates:
- package-ecosystem: gradle
directory: "/"
schedule:
interval: weekly
open-pull-requests-limit: 0
target-branch: 3.3.x
labels:
- "type: dependency upgrade"
- "relates-to: v3"
- package-ecosystem: gradle
directory: "/"
schedule:
interval: weekly
open-pull-requests-limit: 0
target-branch: 4.1.x
labels:
- "type: dependency upgrade"
- "relates-to: v4"
ignore:
- dependency-name: "*"
update-types: [ "version-update:semver-minor", "version-update:semver-major" ]
updates:
- package-ecosystem: gradle
directory: "/"
schedule:
interval: daily
open-pull-requests-limit: 10
target-branch: 5.4.x
target-branch: 6.2.x
labels:
- "type: dependency upgrade"
ignore:
- dependency-name: "*"
update-types: ["version-update:semver-major"]
- dependency-name: "*"
update-types: ["version-update:semver-major", "version-update:semver-minor"]
- package-ecosystem: gradle
directory: "/"
schedule:
interval: daily
open-pull-requests-limit: 10
target-branch: 6.0.x
target-branch: 7.0.x
labels:
- "type: dependency upgrade"
ignore:
- dependency-name: "*"
update-types: ["version-update:semver-patch", "version-update:semver-minor"]
24 changes: 21 additions & 3 deletions .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,25 @@ on:
- '[3-9]+.[3-9]+.x'
workflow_dispatch:
jobs:
skip_check:
runs-on: ubuntu-latest
outputs:
found_skip_publish: ${{ steps.check_prevent_property.outputs.value }}
permissions:
contents: read
steps:
- name: "📥 Checkout 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
build:
needs: skip_check
permissions:
contents: read # to fetch code (actions/checkout)
strategy:
Expand All @@ -35,9 +53,9 @@ jobs:
env:
DEVELOCITY_BUILD_CACHE_NODE_USER: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER }}
DEVELOCITY_BUILD_CACHE_NODE_KEY: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY }}
run: ./gradlew build groovydoc
run: ./gradlew build assemble groovydoc
publish:
if: github.event_name == 'push'
if: github.event_name == 'push' && needs.skip_check.outputs.found_skip_publish != 'true'
needs: build
permissions:
contents: read # limit to read access
Expand Down Expand Up @@ -66,7 +84,7 @@ jobs:
-Dorg.gradle.internal.publish.checksums.insecure=true
publish
docs:
if: github.event_name == 'push'
if: github.event_name == 'push' && needs.skip_check.outputs.found_skip_publish != 'true'
needs: publish
runs-on: ubuntu-latest
permissions:
Expand Down
Loading

0 comments on commit 395d02f

Please sign in to comment.