Fix release CI

ctc-oss · Mar 15, 2022 · d53f79c · d53f79c
1 parent 1d41358
commit d53f79c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/src/bindings/scala/ci/release.sbt → .github/release.sbt b/src/bindings/scala/ci/release.sbt → .github/release.sbt
@@ -18,7 +18,7 @@ import BuildSupport._
 import play.api.libs.json._
 
 lazy val packageData = Json.parse(
-  scala.io.Source.fromFile("../../rpc/client/ts/package.json"
+  scala.io.Source.fromFile("src/rpc/client/ts/package.json"
 ).mkString).as[JsObject]
 lazy val omegaVersion = packageData("version").as[String]
 
@@ -62,7 +62,7 @@ lazy val omega_edit = project
   .aggregate(api, spi, native)
 
 lazy val api = project
-  .in(file("api"))
+  .in(file("src/bindings/scala/api"))
   .dependsOn(spi)
   .settings(commonSettings)
   .settings(
@@ -95,7 +95,7 @@ lazy val api = project
   .enablePlugins(BuildInfoPlugin, GitVersioning)
 
 lazy val native = project
-  .in(file("native"))
+  .in(file("src/bindings/scala/native"))
   .dependsOn(spi)
   .settings(commonSettings)
   .settings(
@@ -122,7 +122,7 @@ lazy val native = project
   .enablePlugins(BuildInfoPlugin, GitVersioning)
 
 lazy val spi = project
-  .in(file("spi"))
+  .in(file("src/bindings/scala/spi"))
   .settings(commonSettings)
   .settings(
     name := "omega-edit-spi"

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -169,29 +169,27 @@ jobs:
       - name: Move windows and macos jars out
         run: |
           for folder in "omega-edit-native_2.12" "omega-edit-native_2.13"; do
-            mv ${folder}/${{ env.PKG_VERSION }}/${folder}-${{ env.PKG_VERSION }}-windows-* src/bindings/scala/
-            mv ${folder}/${{ env.PKG_VERSION }}/${folder}-${{ env.PKG_VERSION }}-macos-* src/bindings/scala/
+            mv ${folder}/${{ env.PKG_VERSION }}/${folder}-${{ env.PKG_VERSION }}-windows-* .
+            mv ${folder}/${{ env.PKG_VERSION }}/${folder}-${{ env.PKG_VERSION }}-macos-* .
           done
 
       - name: Package Scala Native
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          mv ci/release.sbt build.sbt
+          mv build.sbt .github/build.sbt
+          mv .github/release.sbt build.sbt
           sbt +native/publish
-        working-directory: src/bindings/scala
 
       - name: Package Scala API
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: sbt +api/publish
-        working-directory: src/bindings/scala
 
       - name: Package Scala SPI
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: sbt +spi/publish
-        working-directory: src/bindings/scala
 
   server-packaging:
     needs: [api-native-publish]