Skip to content

Commit

Permalink
Merge pull request #596 from fd4s/revert-561-disable-docusaurus
Browse files Browse the repository at this point in the history
Revert "Temporarily disable docusaurus"
  • Loading branch information
vlovgr authored Jun 13, 2024
2 parents 540e2c7 + fc7d786 commit 529d2bd
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 29 deletions.
4 changes: 0 additions & 4 deletions .github/release-drafter.yml

This file was deleted.

15 changes: 10 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -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
- uses: actions/checkout@v4
with:
fetch-depth: 0
- uses: olafurpg/setup-scala@v10
- uses: coursier/cache-action@v5
- uses: coursier/cache-action@v6
- uses: coursier/setup-action@v1
with:
jvm: adoptium:1.11.0.22
apps: sbt
- run: sbt validate
11 changes: 0 additions & 11 deletions .github/workflows/notes.yml

This file was deleted.

18 changes: 11 additions & 7 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -1,22 +1,26 @@
name: release
on:
push:
branches: ["master"]
tags: ["*"]
branches:
- "master"
tags:
- "**"
jobs:
publish:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
fetch-depth: 0
- uses: olafurpg/setup-scala@v10
- uses: coursier/cache-action@v6
- uses: coursier/setup-action@v1
with:
jvm: adoptium:1.11.0.22
apps: sbt
- 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
- run: sbt ci-release
- run: sbt ci-release docs/docusaurusPublishGhpages
9 changes: 7 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -322,6 +322,7 @@ lazy val noPublishSettings =
lazy val scalaSettings = Seq(
scalaVersion := scala213,
crossScalaVersions := Seq(scala212, scala213),
javacOptions ++= Seq("--release", "8"),
scalacOptions ++= {
val commonScalacOptions =
Seq(
Expand All @@ -343,7 +344,9 @@ lazy val scalaSettings = Seq(
"-Ywarn-numeric-widen",
"-Ywarn-value-discard",
"-Ywarn-unused",
"-Wconf:cat=unused-nowarn:s"
"-Wconf:cat=unused-nowarn:s",
"-release",
"8"
)
} else Seq()

Expand All @@ -363,7 +366,9 @@ lazy val scalaSettings = Seq(
val scala3ScalacOptions =
if (scalaVersion.value.startsWith("3")) {
Seq(
"-Ykind-projector"
"-Ykind-projector",
"-java-output-version",
"8"
)
} else Seq()

Expand Down

0 comments on commit 529d2bd

Please sign in to comment.