Skip to content

Commit 3afdc2f

Browse files
committed
fix publishing for custom Scala.js version on 2.11
1 parent 57adc7f commit 3afdc2f

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
@@ -94,6 +94,7 @@ lazy val compat = new MultiScalaCrossProject(
9494
}
9595
)
9696
.jvmSettings(
97+
publish / skip := sys.env.get("CI_SCALAJS_VERSION").isDefined,
9798
Test / unmanagedSourceDirectories += (ThisBuild / baseDirectory).value / "compat/src/test/scala-jvm",
9899
Compile / unmanagedSourceDirectories += {
99100
val jvmParent = (ThisBuild / baseDirectory).value / "compat/jvm/src/main"
@@ -108,6 +109,9 @@ lazy val compat = new MultiScalaCrossProject(
108109
)
109110
.disablePlugins(ScalafixPlugin),
110111
_.jsSettings(
112+
publish / skip :=
113+
(CrossVersion.partialVersion(scalaVersion.value) != Some((2, 11))) ==
114+
sys.env.get("CI_SCALAJS_VERSION").isDefined,
111115
scalacOptions ++= {
112116
val x = (LocalRootProject / baseDirectory).value.toURI.toString
113117
val y = "https://raw.githubusercontent.com/scala/scala-collection-compat/" + sys.process
@@ -133,6 +137,7 @@ lazy val compat = new MultiScalaCrossProject(
133137
Test / fork := false // Scala.js cannot run forked tests
134138
).jsEnablePlugins(ScalaJSJUnitPlugin),
135139
_.nativeSettings(
140+
publish / skip := sys.env.get("CI_SCALAJS_VERSION").isDefined,
136141
mimaPreviousArtifacts := (CrossVersion.partialVersion(scalaVersion.value) match {
137142
case Some((3, 1)) => mimaPreviousArtifacts.value.filter(_.revision != "2.6.0")
138143
case _ => mimaPreviousArtifacts.value
@@ -214,7 +219,8 @@ lazy val scalafixRules = project
214219
versionCheck := {}, // I don't understand why this fails otherwise?! oh well
215220
name := "scala-collection-migrations",
216221
scalaVersion := scalafixScala212,
217-
libraryDependencies += "ch.epfl.scala" %% "scalafix-core" % scalafixVersion
222+
libraryDependencies += "ch.epfl.scala" %% "scalafix-core" % scalafixVersion,
223+
publish / skip := sys.env.get("CI_SCALAJS_VERSION").isDefined,
218224
)
219225

220226
// == Scalafix Test Setup ==

0 commit comments

Comments
 (0)