diff --git a/.github/dependabot.yml b/.github/dependabot.yml deleted file mode 100644 index 928f16bb..00000000 --- a/.github/dependabot.yml +++ /dev/null @@ -1,21 +0,0 @@ -version: 2 -updates: - - package-ecosystem: "gradle" - directory: "gradle-twirl" - schedule: - interval: "weekly" - - package-ecosystem: "maven" - directory: "maven-twirl" - schedule: - interval: "weekly" - - package-ecosystem: "github-actions" - directory: "/" - schedule: - interval: "weekly" - - package-ecosystem: "github-actions" - directory: "/" - schedule: - interval: "weekly" - target-branch: "1.6.x" - commit-message: - prefix: "[1.6.x] " diff --git a/.github/scala-steward.conf b/.github/scala-steward.conf index 0d8ee0fc..be315089 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 = "[2.0.x] ${artifactName} ${nextVersion} (was ${currentVersion})" pullRequests.grouping = [ - { name = "patches", "title" = "Patch updates", "filter" = [{"version" = "patch"}] } + { name = "patches", "title" = "[2.0.x] Patch updates", "filter" = [{"version" = "patch"}] } ] buildRoots = [ diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 4ed8213b..7111297c 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 + - 2.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 df0daa30..6dbcbf82 100644 --- a/.github/workflows/dependency-graph.yml +++ b/.github/workflows/dependency-graph.yml @@ -2,7 +2,7 @@ name: Dependency Graph on: push: branches: - - main + - 2.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 1bc301ce..12707aa6 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -3,7 +3,7 @@ name: Publish on: push: branches: # Snapshots - - main + - 2.0.x tags: ["**"] # Releases jobs: diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml index 7ce3b9a2..9bb450b6 100644 --- a/.github/workflows/release-drafter.yml +++ b/.github/workflows/release-drafter.yml @@ -3,7 +3,7 @@ name: Release Drafter on: push: branches: - - main + - 2.0.x jobs: update_release_draft: @@ -12,7 +12,7 @@ jobs: - uses: release-drafter/release-drafter@v6 with: name: "Twirl $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 }}