From fc08ba242762e936c848a7bbc17fbdc15c1c68f4 Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Tue, 14 Feb 2023 07:35:11 -0800 Subject: [PATCH 01/11] Update and rename plugins.sbt to sbt-best-practice.sbt --- project/plugins.sbt | 13 ------------- project/sbt-best-practice.sbt | 3 +++ 2 files changed, 3 insertions(+), 13 deletions(-) delete mode 100644 project/plugins.sbt create mode 100644 project/sbt-best-practice.sbt diff --git a/project/plugins.sbt b/project/plugins.sbt deleted file mode 100644 index 183c101..0000000 --- a/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -addSbtPlugin( - "com.thoughtworks.sbt-best-practice" % "sbt-best-practice" % "8.2.5" -) - -addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.17") - -addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.1.1") - -addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.2.1") - -addSbtPlugin("org.lyranthe.sbt" % "partial-unification" % "1.1.2") - -addSbtPlugin("com.thoughtworks.example" % "sbt-example" % "9.2.1") diff --git a/project/sbt-best-practice.sbt b/project/sbt-best-practice.sbt new file mode 100644 index 0000000..1340249 --- /dev/null +++ b/project/sbt-best-practice.sbt @@ -0,0 +1,3 @@ +addSbtPlugin( + "com.thoughtworks.sbt-best-practice" % "sbt-best-practice" % "8.3.0" +) From 0ff30d8ef4d03bb3ae8fa6f38e25413da14c188d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 1 Jul 2023 14:34:28 -0700 Subject: [PATCH 02/11] Update scalafmt-core to 3.7.1 in template (#16) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> From 421e1741b53e117878cc63aae3d68a8af9bed8a0 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 1 Jul 2023 14:37:04 -0700 Subject: [PATCH 03/11] Update scalafmt-core to 3.7.5 in template (#22) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index d4dfbab..e26dcdb 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,3 +1,3 @@ runner.dialect = scala212source3 -version = "3.7.1" +version = "3.7.5" maxColumn = 80 From 4614ec7e371325f4e4560d56e47a4e5805c4f3a0 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 1 Jul 2023 14:37:24 -0700 Subject: [PATCH 04/11] Update sbt to 1.8.3 in template (#21) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 46e43a9..72413de 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.8.2 +sbt.version=1.8.3 From 08fb7550a580d79a6276db251d6974399adf09b6 Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Sat, 1 Jul 2023 14:55:34 -0700 Subject: [PATCH 05/11] Add GitHub Action to pull scala-project-template --- .github/workflows/scala-project-template.yml | 30 ++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 .github/workflows/scala-project-template.yml diff --git a/.github/workflows/scala-project-template.yml b/.github/workflows/scala-project-template.yml new file mode 100644 index 0000000..2323a1f --- /dev/null +++ b/.github/workflows/scala-project-template.yml @@ -0,0 +1,30 @@ +on: + push: + branches-ignore: + - "update/**" + schedule: + - cron: "0 0 * * 0" + workflow_dispatch: + +name: Update Scala project template + +jobs: + update-scala-project-template: + permissions: + # for aws-actions/configure-aws-credentials to assume an AWS role + id-token: write + # for peter-evans/create-pull-request to create branch + contents: write + # for peter-evans/create-pull-request to create a PR + pull-requests: write + runs-on: ubuntu-22.04 + steps: + - uses: actions/checkout@v3 + with: + ref: template + repository: Atry/scala-project-template + - uses: peter-evans/create-pull-request@v5 + with: + branch: update/${{github.ref_name}}/scala-project-template + title: Update scala-project-template + token: ${{ secrets.PERSONAL_ACCESS_TOKEN || github.token }} From fa385236069f4558252e041404758bd73fa12cda Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 1 Jul 2023 14:56:59 -0700 Subject: [PATCH 06/11] Update sbt to 1.9.1 in template (#24) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 72413de..3c0b78a 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.8.3 +sbt.version=1.9.1 From 744999edf7dc464ab58ac5a4c2947b8092db9053 Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Sat, 1 Jul 2023 15:17:44 -0700 Subject: [PATCH 07/11] Update scala-project-template.yml --- .github/workflows/scala-project-template.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/scala-project-template.yml b/.github/workflows/scala-project-template.yml index 2323a1f..e72da06 100644 --- a/.github/workflows/scala-project-template.yml +++ b/.github/workflows/scala-project-template.yml @@ -23,8 +23,11 @@ jobs: with: ref: template repository: Atry/scala-project-template + - run: git config remote.origin.url "${{github.repositoryUrl}}" - uses: peter-evans/create-pull-request@v5 with: + delete-branch: true + base: ${{github.ref_name}} branch: update/${{github.ref_name}}/scala-project-template title: Update scala-project-template token: ${{ secrets.PERSONAL_ACCESS_TOKEN || github.token }} From 418b18df2a7e19c7e6a33a6522be830eb6636446 Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Sat, 1 Jul 2023 15:21:20 -0700 Subject: [PATCH 08/11] Update scala-project-template.yml --- .github/workflows/scala-project-template.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/scala-project-template.yml b/.github/workflows/scala-project-template.yml index e72da06..0eef2e5 100644 --- a/.github/workflows/scala-project-template.yml +++ b/.github/workflows/scala-project-template.yml @@ -23,7 +23,7 @@ jobs: with: ref: template repository: Atry/scala-project-template - - run: git config remote.origin.url "${{github.repositoryUrl}}" + - run: git config remote.origin.url "https://github.com/${{github.repository}}" - uses: peter-evans/create-pull-request@v5 with: delete-branch: true From c31f513245b4810429f59453907c96ee22f69fea Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Sat, 1 Jul 2023 15:28:13 -0700 Subject: [PATCH 09/11] Update scala-project-template.yml --- .github/workflows/scala-project-template.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/scala-project-template.yml b/.github/workflows/scala-project-template.yml index 0eef2e5..90ec861 100644 --- a/.github/workflows/scala-project-template.yml +++ b/.github/workflows/scala-project-template.yml @@ -24,6 +24,7 @@ jobs: ref: template repository: Atry/scala-project-template - run: git config remote.origin.url "https://github.com/${{github.repository}}" + - run: git switch -c ${{github.ref_name}} - uses: peter-evans/create-pull-request@v5 with: delete-branch: true From 885406c5ac56b058fa717cf18e7529fe746a8213 Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Sat, 1 Jul 2023 15:31:21 -0700 Subject: [PATCH 10/11] Delete .gitpod.yml --- .gitpod.yml | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 .gitpod.yml diff --git a/.gitpod.yml b/.gitpod.yml deleted file mode 100644 index cd17bda..0000000 --- a/.gitpod.yml +++ /dev/null @@ -1,5 +0,0 @@ -image: igeolise/scalajs-test-runner:latest -vscode: - extensions: - - scala-lang.scala@0.3.8:wQBBM+lKILHBqOqlqW60xA== - - scalameta.metals@1.9.0:EyAIfy0ykjUn9htpw3f7GA== \ No newline at end of file From a335404c2376171c51fadd9eb20ccf71e3a7f684 Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Sat, 1 Jul 2023 15:35:56 -0700 Subject: [PATCH 11/11] Update scala-project-template.yml --- .github/workflows/scala-project-template.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/scala-project-template.yml b/.github/workflows/scala-project-template.yml index 90ec861..982e639 100644 --- a/.github/workflows/scala-project-template.yml +++ b/.github/workflows/scala-project-template.yml @@ -20,11 +20,8 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v3 - with: - ref: template - repository: Atry/scala-project-template - - run: git config remote.origin.url "https://github.com/${{github.repository}}" - - run: git switch -c ${{github.ref_name}} + - run: git fetch https://github.com/Atry/scala-project-template.git template + - run: git reset --hard FETCH_HEAD - uses: peter-evans/create-pull-request@v5 with: delete-branch: true