publish fix (#4)

AM-i-B-V · Apr 25, 2024 · 04fe68c · 04fe68c
1 parent 48ded38
commit 04fe68c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 18 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -80,11 +80,11 @@ jobs:
 
  - name: Make target directories
  if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main' || github.ref == 'refs/heads/series/0.1')
- run: mkdir -p project/target
+ run: mkdir -p modules/core/native/target modules/xray/.jvm/target modules/core/js/target modules/core/jvm/target project/target
 
  - name: Compress target directories
  if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main' || github.ref == 'refs/heads/series/0.1')
- run: tar cf targets.tar project/target
+ run: tar cf targets.tar modules/core/native/target modules/xray/.jvm/target modules/core/js/target modules/core/jvm/target project/target
 
  - name: Upload target directories
  if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main' || github.ref == 'refs/heads/series/0.1')
@@ -261,5 +261,5 @@ jobs:
  - name: Submit Dependencies
  uses: scalacenter/sbt-dependency-submission@v2
  with:
- modules-ignore: rootjs_2.12 rootjs_2.13 rootjs_3 natchez-core_native0.4_2.12 natchez-core_native0.4_2.13 natchez-core_native0.4_3 natchez-xray_2.12 natchez-xray_2.13 natchez-xray_3 natchez-core_sjs1_2.12 natchez-core_sjs1_2.13 natchez-core_sjs1_3 natchez-core_2.12 natchez-core_2.13 natchez-core_3 rootjvm_2.12 rootjvm_2.13 rootjvm_3 rootnative_2.12 rootnative_2.13 rootnative_3
+ modules-ignore: rootjs_2.12 rootjs_2.13 rootjs_3 rootjvm_2.12 rootjvm_2.13 rootjvm_3 rootnative_2.12 rootnative_2.13 rootnative_3
  configs-ignore: test scala-tool scala-doc-tool test-internal
diff --git a/build.sbt b/build.sbt
@@ -1,4 +1,3 @@
-import org.typelevel.sbt.gha.WorkflowStep
 import org.typelevel.sbt.gha.WorkflowStep.Sbt
 ThisBuild / tlBaseVersion := "0.3"
 
@@ -13,7 +12,6 @@ val catsEffectVersion = "3.5.4"
 val fs2Version = "3.10.2"
 
 // Publishing
-
 ThisBuild / organization := "org.ami.b.v"
 ThisBuild / licenses := Seq(("MIT", url("http://opensource.org/licenses/MIT")))
 ThisBuild / developers := List(
@@ -26,17 +24,6 @@ ThisBuild / tlCiReleaseBranches += "series/0.1"
 // start MiMa from here
 ThisBuild / tlVersionIntroduced := List("2.12", "2.13", "3").map(_ -> "0.1.6").toMap
 
-//ThisBuild / githubWorkflowAddedJobs +=
-// WorkflowJob(
-// id = "docs",
-// name = s"Make site",
-// scalas = List(scala213Version),
-// steps = List(WorkflowStep.CheckoutFull) ++
-// WorkflowStep.SetupJava(githubWorkflowJavaVersions.value.toList) ++
-// githubWorkflowGeneratedCacheSteps.value ++
-// List(WorkflowStep.Sbt(List("docs/makeSite")))
-// )
-
 // https:/sbt/sbt/issues/6997
 ThisBuild / libraryDependencySchemes ++= Seq(
  "org.scala-lang.modules" %% "scala-xml" % VersionScheme.Always
@@ -74,7 +61,6 @@ lazy val root = tlCrossRootProject.aggregate(
 
 lazy val core = crossProject(JSPlatform, JVMPlatform, NativePlatform)
  .in(file("modules/core"))
- .enablePlugins(NoPublishPlugin)
  .disablePlugins(TypelevelSonatypePlugin)
  .settings(commonSettings)
  .settings(
@@ -96,7 +82,6 @@ lazy val core = crossProject(JSPlatform, JVMPlatform, NativePlatform)
 lazy val xray = crossProject(JVMPlatform)
  .crossType(CrossType.Pure)
  .in(file("modules/xray"))
- .enablePlugins(NoPublishPlugin)
  .disablePlugins(TypelevelSonatypePlugin)
  .settings(commonSettings)
  .settings(