Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@ jobs:
pull-requests: write
steps:
- name: Auto approve Dependabot PR
uses: secure-software-engineering/actions/dependabot@6856b8183bba81fce20d9052b9aa6f3e20823b36 # develop
uses: secure-software-engineering/actions/dependabot@7458a0f725752b2bf928c2f9e42c818b6abad742 # develop
with:
token: ${{ secrets.AUTO_MERGE_PAT }}
21 changes: 21 additions & 0 deletions .github/workflows/release-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,9 @@ jobs:
runs-on: ubuntu-latest
permissions:
contents: read
# GITHUB_TOKEN approves the bump PR below. The PR is authored by the
# AUTO_MERGE_PAT owner, who cannot approve their own PR.
pull-requests: write
steps:
- name: Checkout master
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
Expand All @@ -149,6 +152,7 @@ jobs:
cache: 'maven'

- name: Bump to next SNAPSHOT and open auto-merge PR
id: bump
env:
GH_TOKEN: ${{ secrets.AUTO_MERGE_PAT }}
ACTOR: ${{ github.actor }}
Expand Down Expand Up @@ -185,3 +189,20 @@ jobs:
fi

gh pr merge "$PR_NUMBER" --auto --merge
echo "pr_number=$PR_NUMBER" >> "$GITHUB_OUTPUT"

- name: Approve next-SNAPSHOT PR as github-actions[bot]
# The PR is opened with AUTO_MERGE_PAT, so its owner is the PR author and
# GitHub won't let them approve it - branch protection requiring a review
# would block the auto-merge forever. Approving with GITHUB_TOKEN counts as
# a review by a different actor (github-actions[bot]).
# Requires the repo/org setting "Allow GitHub Actions to create and approve
# pull requests" (Settings -> Actions -> General -> Workflow permissions).
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
PR_NUMBER: ${{ steps.bump.outputs.pr_number }}
RELEASE_TAG_NAME: ${{ needs.release.outputs.tag_name }}
run: |
set -euo pipefail
gh pr review "$PR_NUMBER" --repo "$GITHUB_REPOSITORY" --approve \
-b "Automated SNAPSHOT bump following ${RELEASE_TAG_NAME}."
2 changes: 1 addition & 1 deletion .github/workflows/release-schedule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
permissions:
contents: read
pull-requests: read
uses: secure-software-engineering/actions/.github/workflows/maven-release-schedule.yml@6856b8183bba81fce20d9052b9aa6f3e20823b36 # develop
uses: secure-software-engineering/actions/.github/workflows/maven-release-schedule.yml@7458a0f725752b2bf928c2f9e42c818b6abad742 # develop
with:
head_branch: master
java_version: '21'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-title-sync.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
startsWith(github.head_ref, 'release/prep-') &&
github.event.pull_request.head.repo.full_name == github.repository
# Reusable workflow: secure-software-engineering/actions/release/README.md
uses: secure-software-engineering/actions/.github/workflows/maven-release-title-sync.yml@6856b8183bba81fce20d9052b9aa6f3e20823b36 # develop
uses: secure-software-engineering/actions/.github/workflows/maven-release-title-sync.yml@7458a0f725752b2bf928c2f9e42c818b6abad742 # develop
with:
java_version: '21'
tag_pattern: 'V{major}.{minor}.{patch}'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
prepare-release:
name: Open release PR against master
# Reusable workflow: secure-software-engineering/actions/release/README.md
uses: secure-software-engineering/actions/.github/workflows/maven-release-prepare.yml@6856b8183bba81fce20d9052b9aa6f3e20823b36 # develop
uses: secure-software-engineering/actions/.github/workflows/maven-release-prepare.yml@7458a0f725752b2bf928c2f9e42c818b6abad742 # develop
with:
release_type: ${{ inputs.release_type }}
head_branch: master
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/style.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ permissions:
jobs:
check-formatting:
# Reusable workflow: secure-software-engineering/actions/.github/workflows/maven-style-check.yml
uses: secure-software-engineering/actions/.github/workflows/maven-style-check.yml@6856b8183bba81fce20d9052b9aa6f3e20823b36 # develop
uses: secure-software-engineering/actions/.github/workflows/maven-style-check.yml@7458a0f725752b2bf928c2f9e42c818b6abad742 # develop
with:
java_version: '21'
java_distribution: adopt
Loading