Skip to content

Commit

Permalink
Merge pull request #1032 from mkurz/3.0.x_aftermath
Browse files Browse the repository at this point in the history
[3.0.x] Switch to 3.0.x branch
  • Loading branch information
mkurz authored Jun 27, 2024
2 parents 50b2228 + 776055b commit f97ddc9
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 20 deletions.
13 changes: 0 additions & 13 deletions .github/dependabot.yml

This file was deleted.

4 changes: 2 additions & 2 deletions .github/scala-steward.conf
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
pullRequests.frequency = "@monthly"

commits.message = "${artifactName} ${nextVersion} (was ${currentVersion})"
commits.message = "[3.0.x] ${artifactName} ${nextVersion} (was ${currentVersion})"

pullRequests.grouping = [
{ name = "patches", "title" = "Patch updates", "filter" = [{"version" = "patch"}] }
{ name = "patches", "title" = "[3.0.x] Patch updates", "filter" = [{"version" = "patch"}] }
]

updates.ignore = [
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:

push:
branches:
- main # Check branch after merge
- 3.0.x # Check branch after merge

concurrency:
# Only run once for latest commit per ref and cancel other (previous) runs.
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dependency-graph.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Dependency Graph
on:
push:
branches:
- main
- 3.0.x

concurrency:
# Only run once for latest commit per ref and cancel other (previous) runs.
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Publish
on:
push:
branches: # Snapshots
- main
- 3.0.x
tags: ["**"] # Releases

jobs:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release-drafter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Release Drafter
on:
push:
branches:
- main
- 3.0.x

jobs:
update_release_draft:
Expand All @@ -12,7 +12,7 @@ jobs:
- uses: release-drafter/release-drafter@v6
with:
name: "Play JSON $RESOLVED_VERSION"
config-name: release-drafts/increasing-minor-version.yml # located in .github/ in the default branch within this or the .github repo
config-name: release-drafts/increasing-patch-version.yml # located in .github/ in the default branch within this or the .github repo
commitish: ${{ github.ref_name }}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

0 comments on commit f97ddc9

Please sign in to comment.