From 55126592058d647803b0618c55d9473d6823db68 Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Mon, 3 Jan 2022 20:47:54 +0100 Subject: [PATCH 1/7] Enable MiMa on the 2.2.x branch --- build.sbt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/build.sbt b/build.sbt index 5c3142c..56edc1e 100644 --- a/build.sbt +++ b/build.sbt @@ -23,9 +23,10 @@ lazy val cachecontrol = (project in file(".")) slf4j, slf4jSimple % Test ), - // On the main branch we don't check for incompatible changes, - // because it's ok to introduce breaking changes between minor version bumps - mimaPreviousArtifacts := Set.empty, + mimaPreviousArtifacts := Set( + organization.value %% name.value % previousStableVersion.value + .getOrElse(throw new Error("Unable to determine previous version")) + ), sonatypeProfileName := "com.typesafe", headerLicense := { Some( From 0524d0a0d761bbaca957d236818f6567db50a530 Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Mon, 3 Jan 2022 21:08:23 +0100 Subject: [PATCH 2/7] Set correct sonatypeProfileName --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 56edc1e..2e4d373 100644 --- a/build.sbt +++ b/build.sbt @@ -27,7 +27,7 @@ lazy val cachecontrol = (project in file(".")) organization.value %% name.value % previousStableVersion.value .getOrElse(throw new Error("Unable to determine previous version")) ), - sonatypeProfileName := "com.typesafe", + sonatypeProfileName := "com.typesafe.play", headerLicense := { Some( HeaderLicense.Custom( From 4abdb0c2742899dc4a7051722c21bc50be9baf1e Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Mon, 7 Feb 2022 01:48:57 +0100 Subject: [PATCH 3/7] Add release drafter with configs from .github repo --- .github/workflows/release-drafter.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 .github/workflows/release-drafter.yml diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml new file mode 100644 index 0000000..bcd7ca8 --- /dev/null +++ b/.github/workflows/release-drafter.yml @@ -0,0 +1,18 @@ +name: Release Drafter + +on: + push: + branches: + - main + +jobs: + update_release_draft: + runs-on: ubuntu-latest + steps: + - uses: release-drafter/release-drafter@v5 + with: + name: "cachecontrol $RESOLVED_VERSION" + config-name: release-drafts/increasing-patch-version.yml # located in .github/ in the default branch within this or the .github repo + commitish: ${{ env.GITHUB_REF_NAME }} + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 77d1bfbb161b528ca30af1360c79415acd9740cf Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Mon, 7 Feb 2022 01:51:47 +0100 Subject: [PATCH 4/7] Use correct branch in workflow --- .github/workflows/release-drafter.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml index bcd7ca8..f4a5062 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.2.x jobs: update_release_draft: From c21012d9e656479486ba293d487fcf8df7913448 Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Mon, 7 Feb 2022 02:00:58 +0100 Subject: [PATCH 5/7] Need to use main as commitish until 2.2.1 gets released --- .github/workflows/release-drafter.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml index f4a5062..32fb307 100644 --- a/.github/workflows/release-drafter.yml +++ b/.github/workflows/release-drafter.yml @@ -13,6 +13,7 @@ jobs: with: name: "cachecontrol $RESOLVED_VERSION" config-name: release-drafts/increasing-patch-version.yml # located in .github/ in the default branch within this or the .github repo - commitish: ${{ env.GITHUB_REF_NAME }} + # commitish: ${{ env.GITHUB_REF_NAME }} + commitish: main # Use until 2.2.1 got released, after that use the (commented out) line above env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From fd8047b056da3d68ae41a34ab253cb7c214d3232 Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Mon, 7 Feb 2022 22:18:29 +0100 Subject: [PATCH 6/7] Fix release drafter again --- .github/workflows/release-drafter.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml index 32fb307..f4a5062 100644 --- a/.github/workflows/release-drafter.yml +++ b/.github/workflows/release-drafter.yml @@ -13,7 +13,6 @@ jobs: with: name: "cachecontrol $RESOLVED_VERSION" config-name: release-drafts/increasing-patch-version.yml # located in .github/ in the default branch within this or the .github repo - # commitish: ${{ env.GITHUB_REF_NAME }} - commitish: main # Use until 2.2.1 got released, after that use the (commented out) line above + commitish: ${{ env.GITHUB_REF_NAME }} env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From ab2ed20a7a0f8da910b0c14346aa8edb40711ad7 Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Tue, 8 Feb 2022 10:32:13 +0100 Subject: [PATCH 7/7] Fix commitish in release drafter --- .github/workflows/release-drafter.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml index f4a5062..31fdcac 100644 --- a/.github/workflows/release-drafter.yml +++ b/.github/workflows/release-drafter.yml @@ -13,6 +13,6 @@ jobs: with: name: "cachecontrol $RESOLVED_VERSION" config-name: release-drafts/increasing-patch-version.yml # located in .github/ in the default branch within this or the .github repo - commitish: ${{ env.GITHUB_REF_NAME }} + commitish: ${{ github.ref_name }} env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}