hopefully this fixes the weird directory error

DaemonicLabs · Jan 12, 2021 · 908d029 · 908d029
1 parent f39312c
commit 908d029
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/.github/workflows/PUBLISH_SNAPSHOT.yml b/.github/workflows/PUBLISH_SNAPSHOT.yml
@@ -39,16 +39,16 @@ jobs:
          echo "BRANCH=${{ env.BRANCH }}"
          echo "VERSION=${{ env.VERSION }}"
          echo "RELEASE_TAG=${{ env.RELEASE_TAG }}"
-     - name: Generate wrappers
-       run: |
-         mkdir empty_project
-         java -jar voodoo/build/libs/voodoo-${{ env.VERSION }}-all.jar --rootDir empty_project generateWrapper
-         cd empty_project && zip -r ../empty_project.zip ./*
      - name: test
        run: |
          pwd
          cd empty_project && pwd
          pwd
+     - name: Generate wrappers
+       run: |
+         mkdir empty_voodoo_project
+         java -jar voodoo/build/libs/voodoo-${{ env.VERSION }}-all.jar --rootDir empty_voodoo_project generateWrapper
+         zip -r ../empty_voodoo_project.zip ./empty_voodoo_project
      - name: Create prerelease
        uses: meeDamian/[email protected]
        with:
@@ -64,4 +64,4 @@ jobs:
            voodoo-${{ env.VERSION }}.jar:voodoo/build/libs/voodoo-${{ env.VERSION }}-all.jar
            multimc-installer-${{ env.VERSION }}.jar:multimc/installer/build/libs/multimc-installer-${{ env.VERSION }}-all.jar
            server-installer-${{ env.VERSION }}.jar:server-installer/build/libs/server-installer-${{ env.VERSION }}-all.jar
-           empty_project.zip:empty_project.zip
+           empty_voodoo_project.zip:empty_voodoo_project.zip
diff --git a/voodoo/src/main/kotlin/voodoo/cli/GenerateWrapperCommand.kt b/voodoo/src/main/kotlin/voodoo/cli/GenerateWrapperCommand.kt
@@ -37,7 +37,8 @@ class GenerateWrapperCommand : CliktCommand(
             )
 
             // create wrapper.properties
-            val propertiesFile = wrapperFile.resolve("../wrapper.properties")
+            val propertiesFile = rootDir.resolve("wrapper/wrapper.properties")
+            propertiesFile.absoluteFile.parentFile.mkdirs()
             val properties = Properties().also { prop ->
                 val groupPath = GeneratedConstants.MAVEN_GROUP.replace('.','/')
                 val version = if(GeneratedConstants.FULL_VERSION.endsWith("-local")) {