From 98c5842d143892a14d6574fa00bcbef80f3368f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johan=20Andr=C3=A9n?= Date: Wed, 30 Nov 2022 11:40:30 +0100 Subject: [PATCH] build: Retarget ci to 1.3.x branch (#749) * build: Retarget ci to 1.3.x branch * Auto-set license url --- .github/workflows/checks.yml | 2 +- .github/workflows/integration-tests-cassandra.yml | 2 +- .github/workflows/integration-tests-grpc.yml | 2 +- .github/workflows/integration-tests-jdbc.yml | 2 +- .github/workflows/integration-tests-kafka.yml | 2 +- .github/workflows/integration-tests-slick.yml | 2 +- .github/workflows/release-drafter.yml | 2 +- .github/workflows/release.yml | 2 +- .github/workflows/unit-tests.yml | 2 +- project/Common.scala | 9 ++++++--- 10 files changed, 15 insertions(+), 12 deletions(-) diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index 0fcf74fb6..a35d62dce 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -4,7 +4,7 @@ on: pull_request: push: branches: - - main + - 1.3.x tags-ignore: [ v.* ] jobs: diff --git a/.github/workflows/integration-tests-cassandra.yml b/.github/workflows/integration-tests-cassandra.yml index 839db81bf..ff0911ca4 100644 --- a/.github/workflows/integration-tests-cassandra.yml +++ b/.github/workflows/integration-tests-cassandra.yml @@ -4,7 +4,7 @@ on: pull_request: push: branches: - - main + - 1.3.x tags-ignore: [ v.* ] jobs: diff --git a/.github/workflows/integration-tests-grpc.yml b/.github/workflows/integration-tests-grpc.yml index dd3eae908..352ee608b 100644 --- a/.github/workflows/integration-tests-grpc.yml +++ b/.github/workflows/integration-tests-grpc.yml @@ -4,7 +4,7 @@ on: pull_request: push: branches: - - main + - 1.3.x tags-ignore: [ v.* ] jobs: diff --git a/.github/workflows/integration-tests-jdbc.yml b/.github/workflows/integration-tests-jdbc.yml index 49800daf3..947e2e5ea 100644 --- a/.github/workflows/integration-tests-jdbc.yml +++ b/.github/workflows/integration-tests-jdbc.yml @@ -4,7 +4,7 @@ on: pull_request: push: branches: - - main + - 1.3.x tags-ignore: [ v.* ] jobs: diff --git a/.github/workflows/integration-tests-kafka.yml b/.github/workflows/integration-tests-kafka.yml index 2c7991de9..ac262a129 100644 --- a/.github/workflows/integration-tests-kafka.yml +++ b/.github/workflows/integration-tests-kafka.yml @@ -4,7 +4,7 @@ on: pull_request: push: branches: - - main + - 1.3.x tags-ignore: [ v.* ] jobs: diff --git a/.github/workflows/integration-tests-slick.yml b/.github/workflows/integration-tests-slick.yml index 990b891e5..db99240e6 100644 --- a/.github/workflows/integration-tests-slick.yml +++ b/.github/workflows/integration-tests-slick.yml @@ -4,7 +4,7 @@ on: pull_request: push: branches: - - main + - 1.3.x tags-ignore: [ v.* ] jobs: diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml index 4eaad0b25..ba1de2dac 100644 --- a/.github/workflows/release-drafter.yml +++ b/.github/workflows/release-drafter.yml @@ -4,7 +4,7 @@ on: push: # branches to consider in the event; optional, defaults to all branches: - - main + - 1.3.x jobs: update_release_draft: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 58e470edc..decbbc514 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -3,7 +3,7 @@ name: Release on: push: branches: - - main + - 1.3.x tags: ["*"] jobs: diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index a2e8fead0..332d186e4 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -4,7 +4,7 @@ on: pull_request: push: branches: - - main + - 1.3.x tags-ignore: [ v.* ] jobs: diff --git a/project/Common.scala b/project/Common.scala index 0765040e2..ac4667b6a 100644 --- a/project/Common.scala +++ b/project/Common.scala @@ -30,9 +30,12 @@ object Common extends AutoPlugin { "Contributors", "https://gitter.im/akka/dev", url("https://github.com/akka/akka-projection/graphs/contributors")), - licenses := Seq( - ("BUSL-1.1", url("https://raw.githubusercontent.com/akka/akka-projection/main/LICENSE")) - ), // FIXME change s/main/v1.3.1/ when released + licenses := { + val tagOrBranch = + if (version.value.endsWith("SNAPSHOT")) "main" + else "v" + version.value + Seq(("BUSL-1.1", url(s"https://raw.githubusercontent.com/akka/akka-projection/${tagOrBranch}/LICENSE"))) + }, description := "Akka Projection.", excludeLintKeys += scmInfo, excludeLintKeys += mimaPreviousArtifacts)