Create artifacts correctly

ddialliance · Dec 1, 2023 · b43a3fe · b43a3fe
1 parent 49760d8
commit b43a3fe
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -31,6 +31,11 @@ jobs:
     - name: Install other dependencies
       run: .\build\install-dependencies.ps1
       shell: pwsh
+
+    - name: Get file suffix
+      id: suffix
+      run: if ($env:GITHUB_REF -match 'refs/tags/(.+)') { $Matches[1] } else { (Get-Date -Format "yyyyMMdd") }
+      shell: pwsh
 
     - name: Run build-windows.bat
       run: .\build\build-windows.bat
@@ -40,11 +45,10 @@ jobs:
       uses: actions/upload-artifact@v3
       with:
           name: ddi-lifecycle-all-outputs
-          path: ddi-lifecycle-all-outputs*.zip
+          path: ddi-lifecycle-all-outputs.zip
 
     - name: Make package artifact
       uses: actions/upload-artifact@v3
       with:
         name: ddi-lifecycle
-        path: |
-          ddi-lifecycle*.zip
+        path: ddi-lifecycle.zip
diff --git a/build/build-windows.bat b/build/build-windows.bat
@@ -48,5 +48,5 @@ echo Zip the artifact directories
 ren ddi-lifecycle-all-outputs ddi-lifecycle-all-outputs-${suffix}
 ren ddi-lifecycle ddi-lifecycle-${suffix}
 
-7z a -tzip ddi-lifecycle-all-outputs-${suffix}.zip ddi-lifecycle-all-outputs-${suffix}\*
-7z a -tzip ddi-lifecycle-${suffix}.zip ddi-lifecycle-${suffix}\*
+7z a -tzip "ddi-lifecycle-all-outputs.zip" "ddi-lifecycle-all-outputs\*"
+7z a -tzip "ddi-lifecycle.zip" "ddi-lifecycle\*"