Skip to content

Commit

Permalink
Merge pull request #410 from cquiroz/sjs0.6
Browse files Browse the repository at this point in the history
Try to publish to scala.js 0.6 correctly
  • Loading branch information
cquiroz authored Aug 12, 2020
2 parents 6437120 + 0ba2d7f commit e27cc69
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 6 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ jobs:
key: ${{ runner.os }}-sbt-${{ hashFiles('build.sbt') }}-${{ hashFiles('project/*.scala') }}
restore-keys: ${{ runner.os }}-sbt-
- name: Publish
run: |
csbt ci-release
SCALAJS_VERSION=0.6.33 csbt ci-release
run: csbt ci-release
- name: Publish 0.6
run: SCALAJS_VERSION=0.6.33 csbt ci-release
env:
PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
PGP_SECRET: ${{ secrets.PGP_SECRET }}
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ tmp/
.project
.scala_dependencies
.settings/
project/metals.sbt

# Mac OS X
._*
Expand Down
11 changes: 8 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ lazy val squants =
parallelExecution in Test := false,
excludeFilter in Test := "*Serializer.scala" || "*SerializerSpec.scala",
scalacOptions in Tut --= Seq("-Ywarn-unused-import", "-Ywarn-unused:imports"),
// sources in (Compile, test) := List() // This is a pity but we can't reliable compile on 1.0.0-M8
)
.jsSettings(Tests.defaultSettings: _*)
.nativeSettings(
Expand All @@ -60,9 +59,15 @@ lazy val squants =

lazy val root = project.in(file("."))
.settings(defaultSettings: _*)
.settings(noPublishSettings)
.settings(
name := "squants",
publish := {},
publishLocal := {}
)
.aggregate(squants.jvm, squants.js, squants.native)

lazy val noPublishSettings = Seq(
publish := {},
publishLocal := {},
publishArtifact := false,
skip in publish := true
)

0 comments on commit e27cc69

Please sign in to comment.