fix macos and windows build archives

t-mart · Feb 27, 2024 · eb97f6a · eb97f6a
1 parent 93f75d8
commit eb97f6a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/.github/workflows/release+build+publish.yml b/.github/workflows/release+build+publish.yml
@@ -163,14 +163,18 @@ jobs:
         if: runner.os == 'Windows'
         shell: bash
         run: |
+          # move file first so we don't get directory structure in the zip
+          mv "${{ steps.make_paths.outputs.binary_dir }}/${{ steps.make_paths.outputs.binary_filename }}" .
           7z a -mx9 "${{ steps.make_paths.outputs.archive_path}}" \
-            "${{ steps.make_paths.outputs.binary_dir }}/${{ steps.make_paths.outputs.binary_filename }}"
+            "${{ steps.make_paths.outputs.binary_filename }}"
 
       - name: Archive (macOS)
         if: runner.os == 'macOS'
         run: |
-          zip -r -9 "${{ steps.make_paths.outputs.archive_path}}" \
-            "${{ steps.make_paths.outputs.binary_dir }}/${{ steps.make_paths.outputs.binary_filename }}"
+          # move file first so we don't get directory structure in the zip
+          mv "${{ steps.make_paths.outputs.binary_dir }}/${{ steps.make_paths.outputs.binary_filename }}" .
+          zip -9 "${{ steps.make_paths.outputs.archive_path}}" \
+            "${{ steps.make_paths.outputs.binary_filename }}"
       
       - name: Upload artifact
         uses: actions/upload-artifact@v4

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "nextver"
-version = "0.7.2"
+version = "0.7.3"
 authors = ["Tim Martin <tim@tim.direct>"]
 readme = "README.md"
 repository = "https://github.com/t-mart/nextver"