diff --git a/.github/dependabot.yml b/.github/dependabot.yml deleted file mode 100644 index 8dbfc00a..00000000 --- a/.github/dependabot.yml +++ /dev/null @@ -1,27 +0,0 @@ -version: 2 -updates: - - package-ecosystem: "github-actions" - directory: "/" - schedule: - interval: "weekly" - - package-ecosystem: "github-actions" - directory: "/" - schedule: - interval: "weekly" - target-branch: "6.0.x" - commit-message: - prefix: "[6.0.x] " - - package-ecosystem: "github-actions" - directory: "/" - schedule: - interval: "weekly" - target-branch: "5.3.x" - commit-message: - prefix: "[5.3.x] " - - package-ecosystem: "github-actions" - directory: "/" - schedule: - interval: "weekly" - target-branch: "5.2.x" - commit-message: - prefix: "[5.2.x] " diff --git a/.github/scala-steward.conf b/.github/scala-steward.conf index c17dba63..7f0a8762 100644 --- a/.github/scala-steward.conf +++ b/.github/scala-steward.conf @@ -1,7 +1,7 @@ pullRequests.frequency = "@monthly" -commits.message = "${artifactName} ${nextVersion} (was ${currentVersion})" +commits.message = "[6.1.x] ${artifactName} ${nextVersion} (was ${currentVersion})" pullRequests.grouping = [ - { name = "patches", "title" = "Patch updates", "filter" = [{"version" = "patch"}] } + { name = "patches", "title" = "[6.1.x] Patch updates", "filter" = [{"version" = "patch"}] } ] diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 30ad55fa..0c2f483b 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 + - 6.1.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 435324f2..253ce767 100644 --- a/.github/workflows/dependency-graph.yml +++ b/.github/workflows/dependency-graph.yml @@ -2,7 +2,7 @@ name: Dependency Graph on: push: branches: - - main + - 6.1.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 db1edc72..a2ef4726 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -3,7 +3,7 @@ name: Publish on: push: branches: # Snapshots - - main + - 6.1.x tags: ["**"] # Releases jobs: diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml index e55c9a4e..995bb7ef 100644 --- a/.github/workflows/release-drafter.yml +++ b/.github/workflows/release-drafter.yml @@ -3,7 +3,7 @@ name: Release Drafter on: push: branches: - - main + - 6.1.x jobs: update_release_draft: @@ -12,7 +12,7 @@ jobs: - uses: release-drafter/release-drafter@v6 with: name: "Play Slick $RESOLVED_VERSION" - config-name: release-drafts/increasing-major-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 }}