From 74e3de65eac6c51e1ede834e2b0704d6c667692d Mon Sep 17 00:00:00 2001 From: Thanh Date: Fri, 23 Feb 2024 12:17:20 +0000 Subject: [PATCH 1/8] Add mergify.yml & upsert-scala-steward-dependencies-branch.yml --- .github/mergify.yml | 20 +++++++++++++++++++ ...sert-scala-steward-dependencies-branch.yml | 20 +++++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100644 .github/mergify.yml create mode 100644 .github/workflows/upsert-scala-steward-dependencies-branch.yml diff --git a/.github/mergify.yml b/.github/mergify.yml new file mode 100644 index 0000000..1258555 --- /dev/null +++ b/.github/mergify.yml @@ -0,0 +1,20 @@ +queue_rules: + - name: default + conditions: + - "check-success=test" + - "check-success=security/snyk (nationalarchives)" +pull_request_rules: + - name: automatic merge for Scala Steward + conditions: + - author=tna-digital-archiving-jenkins + - "check-success=test" + - "check-success=security/snyk (nationalarchives)" + - or: + - files=build.sbt + - files~=^(!?project/) + actions: + review: + type: APPROVE + message: Automatically approving Scala Steward + queue: + name: default diff --git a/.github/workflows/upsert-scala-steward-dependencies-branch.yml b/.github/workflows/upsert-scala-steward-dependencies-branch.yml new file mode 100644 index 0000000..2d80d44 --- /dev/null +++ b/.github/workflows/upsert-scala-steward-dependencies-branch.yml @@ -0,0 +1,20 @@ +name: Upsert `scala-steward-dependencies` branch + +on: + push: + branches: master +jobs: + upsert-develop-branch: + permissions: write-all + runs-on: ubuntu-latest + name: Rebase `scala-steward-dependencies` branch to latest `origin/master` + steps: + - name: Checkout scala-steward-dependencies branch + uses: actions/checkout@v2 + with: + ref: scala-steward-dependencies + fetch-depth: 0 + - name: Rebase `scala-steward-dependencies` branch to latest `origin/master` + run: | + git rebase origin/master + git push -f -u origin scala-steward-dependencies From 39dda4b83b81018eb5d914e181d65ccc3c757d1a Mon Sep 17 00:00:00 2001 From: tna-digital-archiving-jenkins Date: Tue, 27 Feb 2024 07:52:04 +0000 Subject: [PATCH 2/8] Setting version to 0.0.148 --- version.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.sbt b/version.sbt index 1112e8d..62c10e2 100644 --- a/version.sbt +++ b/version.sbt @@ -1 +1 @@ -ThisBuild / version := "0.0.148-SNAPSHOT" +ThisBuild / version := "0.0.148" From b01a4883cdc6079e063dee1c234f83960cb75fce Mon Sep 17 00:00:00 2001 From: tna-digital-archiving-jenkins Date: Tue, 27 Feb 2024 07:55:45 +0000 Subject: [PATCH 3/8] Setting version to 0.0.149-SNAPSHOT --- version.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.sbt b/version.sbt index 62c10e2..72ec6a8 100644 --- a/version.sbt +++ b/version.sbt @@ -1 +1 @@ -ThisBuild / version := "0.0.148" +ThisBuild / version := "0.0.149-SNAPSHOT" From f24b2abd8bf433a35ef52853631faca74ffb6eae Mon Sep 17 00:00:00 2001 From: Thanh Date: Wed, 28 Feb 2024 10:39:55 +0000 Subject: [PATCH 4/8] Mofidy mergify.yml to merge version bump prs --- .github/mergify.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/mergify.yml b/.github/mergify.yml index 1258555..0a49068 100644 --- a/.github/mergify.yml +++ b/.github/mergify.yml @@ -12,6 +12,7 @@ pull_request_rules: - or: - files=build.sbt - files~=^(!?project/) + - files=version.sbt actions: review: type: APPROVE From 9bbcdc6a4a15afc322f9b2cb2f8638ca64bb4fc7 Mon Sep 17 00:00:00 2001 From: tna-digital-archiving-jenkins Date: Thu, 29 Feb 2024 12:44:25 +0000 Subject: [PATCH 5/8] Setting version to 0.0.149 --- version.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.sbt b/version.sbt index 72ec6a8..65ae964 100644 --- a/version.sbt +++ b/version.sbt @@ -1 +1 @@ -ThisBuild / version := "0.0.149-SNAPSHOT" +ThisBuild / version := "0.0.149" From 41df76f74cfdcf09866fd432b948d07f2203dcae Mon Sep 17 00:00:00 2001 From: tna-digital-archiving-jenkins Date: Thu, 29 Feb 2024 12:46:54 +0000 Subject: [PATCH 6/8] Setting version to 0.0.150-SNAPSHOT --- version.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.sbt b/version.sbt index 65ae964..09ba548 100644 --- a/version.sbt +++ b/version.sbt @@ -1 +1 @@ -ThisBuild / version := "0.0.149" +ThisBuild / version := "0.0.150-SNAPSHOT" From f4bb8229acf73c60f48b681335ac1d31cb9411e0 Mon Sep 17 00:00:00 2001 From: tna-digital-archiving-jenkins Date: Sun, 10 Mar 2024 08:42:29 +0000 Subject: [PATCH 7/8] Setting version to 0.0.150 --- version.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.sbt b/version.sbt index 09ba548..deffbb6 100644 --- a/version.sbt +++ b/version.sbt @@ -1 +1 @@ -ThisBuild / version := "0.0.150-SNAPSHOT" +ThisBuild / version := "0.0.150" From 32332f028a9cafe16d9bf2de8579ea0d9623d96d Mon Sep 17 00:00:00 2001 From: tna-digital-archiving-jenkins Date: Sun, 10 Mar 2024 08:43:41 +0000 Subject: [PATCH 8/8] Setting version to 0.0.151-SNAPSHOT --- version.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.sbt b/version.sbt index deffbb6..7078c20 100644 --- a/version.sbt +++ b/version.sbt @@ -1 +1 @@ -ThisBuild / version := "0.0.150" +ThisBuild / version := "0.0.151-SNAPSHOT"