Fix uploading of artifacts.

Lymia · Mar 2, 2022 · 45946d5 · 45946d5
1 parent 4d8557b
commit 45946d5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/.github/workflows/build_dist.yml b/.github/workflows/build_dist.yml
@@ -125,7 +125,7 @@ jobs:
       - uses: actions/upload-artifact@v2
         with:
           name: dist-native-image-${{ matrix.osName }}
-          path: target/scala-2.13/dist/*
+          path: target/dist/*
 
   distUniversal:
     runs-on: ubuntu-latest
@@ -178,7 +178,7 @@ jobs:
       - uses: actions/upload-artifact@v2
         with:
           name: dist-universal
-          path: target/scala-2.13/dist/*
+          path: target/dist/*
 
   publishArtifacts:
     runs-on: ubuntu-latest

diff --git a/build.sbt b/build.sbt
@@ -260,9 +260,9 @@ lazy val loader = project in file("modules/loader") settings (commonSettings ++
   crossPaths := false,
 ))
 
-/*********************************\
-|* Distribution-related Projects *|
-\*********************************/
+/********************************\
+|* Distribution-related scripts *|
+\********************************/
 
 val classPathInfo = TaskKey[(Properties, File)]("class-path-info")
 
@@ -359,6 +359,8 @@ lazy val princessEditClasspath = project in file("target/princess-edit-classpath
   ),
 ))
 
+crossPaths := false
+
 InputKey[Unit]("precompileClassPath") := {
   (princessEditClasspath / classPathInfo).value
   ()