fixup zip structure

acheronfail · Oct 16, 2023 · fae1544 · fae1544
1 parent fae180a
commit fae1544
Showing 1 changed file with 13 additions and 5 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -32,25 +32,33 @@ jobs:
       - name: Archive
         shell: bash
         run: |
+          staging="istat-${{ matrix.target }}"
+
+          mkdir "$staging"
+          cp -a doc "$staging"
+
           files=(
             "target/${{ matrix.target }}/release/istat"
             "target/${{ matrix.target }}/release/istat-ipc"
             "target/${{ matrix.target }}/release/istat-acpi"
             "target/${{ matrix.target }}/release/istat-sensors"
             "target/${{ matrix.target }}/release/istat-signals"
-            "doc/*"
             "README.md"
             "sample_config.toml"
             "sample_included_config.toml"
             "LICENSE"
           )
-          zip "${{ matrix.target }}.zip" ${files[@]}
+          for file in ${files[@]}; do
+            cp $file "$staging"
+          done
+
+          zip "$staging.zip" "$staging"
       # upload zip as an artifact (as a folder called `artifact`)
       - name: Upload artifact
         uses: actions/upload-artifact@v3
         with:
           name: artifacts
-          path: ${{ matrix.target }}.zip
+          path: istat-${{ matrix.target }}.zip
 
   release:
     name: Release
@@ -68,8 +76,8 @@ jobs:
         uses: softprops/action-gh-release@v1
         with:
           files: |
-            artifacts/x86_64-unknown-linux-gnu.zip
-          tag_name: ${{ github.run_number }}
+            artifacts/istat-x86_64-unknown-linux-gnu.zip
+          tag_name: ${{ github.run_number }}-${{ github.sha }}
           prerelease: false
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}