From b1eb37ac78421f218777fd5c5aef0daa36d035b4 Mon Sep 17 00:00:00 2001 From: Viktor Lovgren Date: Thu, 15 Feb 2024 12:27:50 +0100 Subject: [PATCH 1/3] Remove release-drafter workflows --- .github/release-drafter.yml | 4 ---- .github/workflows/notes.yml | 11 ----------- 2 files changed, 15 deletions(-) delete mode 100644 .github/release-drafter.yml delete mode 100644 .github/workflows/notes.yml diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml deleted file mode 100644 index 166330bb..00000000 --- a/.github/release-drafter.yml +++ /dev/null @@ -1,4 +0,0 @@ -template: | - ### Changes - - $CHANGES diff --git a/.github/workflows/notes.yml b/.github/workflows/notes.yml deleted file mode 100644 index 5782c870..00000000 --- a/.github/workflows/notes.yml +++ /dev/null @@ -1,11 +0,0 @@ -name: notes -on: - push: - branches: - - master -jobs: - update: - runs-on: ubuntu-latest - steps: - - run: echo "GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }}" >> $GITHUB_ENV - - uses: release-drafter/release-drafter@v5 From 36a6c74be3001deef76f21f8838c93f4d888f05f Mon Sep 17 00:00:00 2001 From: Viktor Lovgren Date: Thu, 15 Feb 2024 12:37:56 +0100 Subject: [PATCH 2/3] Update workflows to adoptium:1.11.0.22 --- .github/workflows/ci.yml | 21 +++++++++++++-------- .github/workflows/release.yml | 33 +++++++++++++++++++-------------- 2 files changed, 32 insertions(+), 22 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 662a8498..28509d10 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,16 +1,21 @@ name: ci on: push: - branches: ['*'] + branches: + - "**" pull_request: - branches: ['*'] + branches: + - "**" jobs: validate: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - with: - fetch-depth: 0 - - uses: olafurpg/setup-scala@v10 - - uses: coursier/cache-action@v5 - - run: sbt validate + - uses: actions/checkout@v4 + with: + fetch-depth: 0 + - uses: coursier/cache-action@v6 + - uses: coursier/setup-action@v1 + with: + jvm: adoptium:1.11.0.22 + apps: sbt + - run: sbt validate diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3a9df6d2..a97ba2f3 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,21 +1,26 @@ name: release on: push: - branches: ['master'] - tags: ['*'] + branches: + - "master" + tags: + - "**" jobs: publish: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - with: - fetch-depth: 0 - - uses: olafurpg/setup-scala@v10 - - uses: olafurpg/setup-gpg@v3 - - uses: coursier/cache-action@v5 - - run: echo "GIT_DEPLOY_KEY=${{ secrets.GIT_DEPLOY_KEY }}" >> $GITHUB_ENV - - run: echo "PGP_PASSPHRASE=${{ secrets.PGP_PASSPHRASE }}" >> $GITHUB_ENV - - run: echo "PGP_SECRET=${{ secrets.PGP_SECRET }}" >> $GITHUB_ENV - - run: echo "SONATYPE_PASSWORD=${{ secrets.SONATYPE_PASSWORD }}" >> $GITHUB_ENV - - run: echo "SONATYPE_USERNAME=${{ secrets.SONATYPE_USERNAME }}" >> $GITHUB_ENV - - run: sbt ci-release docs/docusaurusPublishGhpages + - uses: actions/checkout@v4 + with: + fetch-depth: 0 + - uses: coursier/cache-action@v6 + - uses: coursier/setup-action@v1 + with: + jvm: adoptium:1.11.0.22 + apps: sbt + - uses: olafurpg/setup-gpg@v3 + - run: echo "GIT_DEPLOY_KEY=${{ secrets.GIT_DEPLOY_KEY }}" >> $GITHUB_ENV + - run: echo "PGP_PASSPHRASE=${{ secrets.PGP_PASSPHRASE }}" >> $GITHUB_ENV + - run: echo "PGP_SECRET=${{ secrets.PGP_SECRET }}" >> $GITHUB_ENV + - run: echo "SONATYPE_PASSWORD=${{ secrets.SONATYPE_PASSWORD }}" >> $GITHUB_ENV + - run: echo "SONATYPE_USERNAME=${{ secrets.SONATYPE_USERNAME }}" >> $GITHUB_ENV + - run: sbt ci-release docs/docusaurusPublishGhpages From ade75c452cc5597e8ec25e9d4f25ea5d45e9c417 Mon Sep 17 00:00:00 2001 From: Viktor Lovgren Date: Thu, 15 Feb 2024 12:41:54 +0100 Subject: [PATCH 3/3] Add '--release 8' javac option --- build.sbt | 1 + 1 file changed, 1 insertion(+) diff --git a/build.sbt b/build.sbt index 6a5c1324..4c1475dd 100644 --- a/build.sbt +++ b/build.sbt @@ -413,6 +413,7 @@ lazy val sharedNativeSettings = Seq( lazy val scalaSettings = Seq( scalaVersion := scala213, crossScalaVersions := Seq(scala212, scala213), + javacOptions ++= Seq("--release", "8"), scalacOptions ++= { val commonScalacOptions = Seq(