From 776055b73ccd6de4e419f1961aacf864d3806e9f Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Thu, 27 Jun 2024 12:33:05 +0200 Subject: [PATCH] Switch to 3.0.x branch --- .github/dependabot.yml | 13 ------------- .github/scala-steward.conf | 4 ++-- .github/workflows/build-test.yml | 2 +- .github/workflows/dependency-graph.yml | 2 +- .github/workflows/publish.yml | 2 +- .github/workflows/release-drafter.yml | 4 ++-- 6 files changed, 7 insertions(+), 20 deletions(-) delete mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml deleted file mode 100644 index ca2061c4..00000000 --- a/.github/dependabot.yml +++ /dev/null @@ -1,13 +0,0 @@ -version: 2 -updates: - - package-ecosystem: "github-actions" - directory: "/" - schedule: - interval: "weekly" - - package-ecosystem: "github-actions" - directory: "/" - schedule: - interval: "weekly" - target-branch: "2.10.x" - commit-message: - prefix: "[2.10.x] " diff --git a/.github/scala-steward.conf b/.github/scala-steward.conf index f7e0b48b..e60e792a 100644 --- a/.github/scala-steward.conf +++ b/.github/scala-steward.conf @@ -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 = [ diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index c15809bb..d0a79d83 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -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. diff --git a/.github/workflows/dependency-graph.yml b/.github/workflows/dependency-graph.yml index 66220ca4..862c34ea 100644 --- a/.github/workflows/dependency-graph.yml +++ b/.github/workflows/dependency-graph.yml @@ -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. diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 481bed9f..b4273313 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -3,7 +3,7 @@ name: Publish on: push: branches: # Snapshots - - main + - 3.0.x tags: ["**"] # Releases jobs: diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml index a9f76d5d..576a1235 100644 --- a/.github/workflows/release-drafter.yml +++ b/.github/workflows/release-drafter.yml @@ -3,7 +3,7 @@ name: Release Drafter on: push: branches: - - main + - 3.0.x jobs: update_release_draft: @@ -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 }}