Merge pull request #6006 from ab9rf/windows-ci-no-zipwrap

update ci to not double-zip windows artifacts

Author: ab9rf

.github/workflows/build-windows.yml

@@ -187,17 +187,13 @@ jobs:
         run: |
           Get-ChildItem -Recurse -File -Path "build" -Filter *.pdb |
             Copy-Item -Destination "pdb"
-      - name: Prep artifact
-        run: |
-          cd output
-          7z a -ttar -so -an . |
-            7z a -si -tbzip2 ../${{ steps.artifactname.outputs.name }}.tar.bz2
       - name: Upload artifact
         if: inputs.artifact-name
         uses: actions/upload-artifact@v4
         with:
           name: ${{ steps.artifactname.outputs.name }}
-          path: ${{ steps.artifactname.outputs.name }}.tar.bz2
+          path: output
+          include-hidden-files: true
       - name: Upload PDBs
         if: inputs.artifact-name && inputs.cache-id == 'release'
         uses: actions/upload-artifact@v4

.github/workflows/generate-symbols.yml

@@ -325,6 +325,7 @@ jobs:
       uses: actions/download-artifact@v4
       with:
         name: dfhack-symbols-windows64-build
+        path: dfhack-windows64-build
     - name: Setup steamcmd
       id: steamcmd
       uses: CyberAndrii/setup-steamcmd@v1
@@ -355,7 +356,7 @@ jobs:
           +login $STEAM_USERNAME \
           "+app_update 975370 $BETA_PARAMS validate" \
           +quit
-        tar xjf dfhack-symbols-windows64-build.tar.bz2 -C DF_steam
+        cp -r dfhack-windows64-build/. DF_steam/
         cp xml/symbols.xml DF_steam/hack
         cd DF_steam
         "./Dwarf Fortress.exe" &

.github/workflows/github-release.yml

@@ -58,8 +58,6 @@ jobs:
       run: |
         mkdir artifacts
         cd dfhack-windows64-build
-        tar xjf dfhack-windows64-build.tar.bz2
-        rm dfhack-windows64-build.tar.bz2
         zip -qr ../artifacts/dfhack-${{ steps.gettag.outputs.name }}-Windows-64bit.zip .
         cd ../dfhack-linux64-build
         mv dfhack-linux64-build.tar.bz2 ../artifacts/dfhack-${{ steps.gettag.outputs.name }}-Linux-64bit.tar.bz2

.github/workflows/steam-deploy.yml

@@ -70,8 +70,10 @@ jobs:
       run: |
         for name in common win64 linux64; do
           cd ${name}-depot
-          tar xjf ${name}-depot.tar.bz2
-          rm ${name}-depot.tar.bz2
+          if [ -f ${name}-depot.tar.bz2 ]; then
+            tar xjf ${name}-depot.tar.bz2
+            rm ${name}-depot.tar.bz2
+          fi
           cd ..
         done
     - name: Get short SHA of commit

.github/workflows/test-suite.yml

@@ -65,9 +65,14 @@ jobs:
       uses: actions/download-artifact@v4
       with:
         name: test-${{ inputs.compiler }}
+        path: ${{ env.DF_FOLDER }}
     - name: Install DFHack
       shell: bash
-      run: tar xjf test-${{ inputs.compiler }}.tar.bz2 -C ${{ env.DF_FOLDER }}
+      run: |
+        if [ -f "${{ env.DF_FOLDER }}/test-${{ inputs.compiler }}.tar.bz2" ]; then
+          tar xjf "${{ env.DF_FOLDER }}/test-${{ inputs.compiler }}.tar.bz2" -C "${{ env.DF_FOLDER }}"
+          rm "${{ env.DF_FOLDER }}/test-${{ inputs.compiler }}.tar.bz2"
+        fi
     - name: Start X server
       if: inputs.os == 'ubuntu'
       run: Xvfb :0 -screen 0 1600x1200x24 &

docs/Installing.rst

@@ -89,7 +89,8 @@ To download a development build from GitHub:
 - Click the number under "Artifacts" (or scroll down)
 - Click on the ``dfhack-*-build-*`` artifact for your platform to download
 
-The artifacts are "double-zipped". That is, you will have to extract the
+The Windows artifacts can be extracted directly into your DF folder. The
+Linux artifacts are "double-zipped". That is, you will have to extract the
 initial zip file to get to the package archive. You can extract this second
 package the same as if you are doing a manual install (see the next section).