Skip to content

Commit 0171d07

Browse files
authored
fix publishing for custom Scala.js version on 2.11 (#714)
1 parent f5072c8 commit 0171d07

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

.github/workflows/release.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@ jobs:
1414
distribution: temurin
1515
java-version: 8
1616
- uses: sbt/setup-sbt@v1
17-
- run: sbt versionCheck ci-release
17+
- run: |
18+
sbt versionCheck ci-release
19+
CI_SCALAJS_VERSION=1.12.0 sbt ci-release
1820
env:
1921
PGP_PASSPHRASE: ${{secrets.PGP_PASSPHRASE}}
2022
PGP_SECRET: ${{secrets.PGP_SECRET}}

build.sbt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@ lazy val compat = new MultiScalaCrossProject(
104104
}
105105
)
106106
.jvmSettings(
107+
publish / skip := sys.env.get("CI_SCALAJS_VERSION").isDefined,
107108
Test / unmanagedSourceDirectories += (ThisBuild / baseDirectory).value / "compat/src/test/scala-jvm",
108109
Compile / unmanagedSourceDirectories += {
109110
val jvmParent = (ThisBuild / baseDirectory).value / "compat/jvm/src/main"
@@ -118,6 +119,9 @@ lazy val compat = new MultiScalaCrossProject(
118119
)
119120
.disablePlugins(ScalafixPlugin),
120121
_.jsSettings(
122+
publish / skip :=
123+
(CrossVersion.partialVersion(scalaVersion.value) != Some((2, 11))) ==
124+
sys.env.get("CI_SCALAJS_VERSION").isDefined,
121125
scalacOptions ++= {
122126
val x = (LocalRootProject / baseDirectory).value.toURI.toString
123127
val y = "https://raw.githubusercontent.com/scala/scala-collection-compat/" + sys.process
@@ -143,6 +147,7 @@ lazy val compat = new MultiScalaCrossProject(
143147
Test / fork := false // Scala.js cannot run forked tests
144148
).jsEnablePlugins(ScalaJSJUnitPlugin),
145149
_.nativeSettings(
150+
publish / skip := sys.env.get("CI_SCALAJS_VERSION").isDefined,
146151
mimaPreviousArtifacts := (CrossVersion.partialVersion(scalaVersion.value) match {
147152
case Some((3, 1)) => mimaPreviousArtifacts.value.filter(_.revision != "2.6.0")
148153
case _ => mimaPreviousArtifacts.value
@@ -224,7 +229,8 @@ lazy val scalafixRules = project
224229
versionCheck := {}, // I don't understand why this fails otherwise?! oh well
225230
name := "scala-collection-migrations",
226231
scalaVersion := scalafixScala212,
227-
libraryDependencies += "ch.epfl.scala" %% "scalafix-core" % scalafixVersion
232+
libraryDependencies += "ch.epfl.scala" %% "scalafix-core" % scalafixVersion,
233+
publish / skip := sys.env.get("CI_SCALAJS_VERSION").isDefined,
228234
)
229235

230236
// == Scalafix Test Setup ==

0 commit comments

Comments
 (0)