Merge branch 'master' of https://github.com/PanosK92/SpartanEngine

PanosK92 · Jan 16, 2025 · 270ff20 · 270ff20
2 parents cceec62 + 7d09a33
commit 270ff20
Showing 1 changed file with 17 additions and 9 deletions.
diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
@@ -60,6 +60,10 @@ jobs:
         shell: cmd
         run: '"%msbuild_path%\MSBuild.exe" /p:Platform=Windows /p:Configuration=${{ matrix.configuration }} /m spartan.sln'
 
+      - name: Get date and time for versioning
+        id: get_datetime
+        run: python -c "from datetime import datetime; print('version='+datetime.utcnow().strftime('%Y.%m.%d.%H.%M'))" >> $GITHUB_OUTPUT
+
       - name: Create artifacts
         if: github.event_name != 'pull_request' && matrix.api == 'vulkan'
         shell: cmd
@@ -74,12 +78,16 @@ jobs:
           )
           echo "Artifact creation completed for ${{ matrix.api }} - ${{ matrix.configuration }}"
 
-      - name: Upload artifact
+      - name: Rename and Upload artifact
         if: github.event_name != 'pull_request' && matrix.api == 'vulkan'
-        uses: actions/upload-artifact@v4
-        with:
-          name: spartan_vulkan_${{ matrix.configuration == 'Release' && 'release' || 'debug' }}
-          path: spartan_vulkan_${{ matrix.configuration == 'Release' && 'release' || 'debug' }}.7z
+        shell: cmd
+        run: |
+          ren spartan_vulkan_${{ matrix.configuration == 'Release' && 'release' || 'debug' }}.7z spartan_vulkan_${{ matrix.configuration == 'Release' && 'release' || 'debug' }}_${{ steps.get_datetime.outputs.version }}.7z
+        - name: Upload artifact
+          uses: actions/upload-artifact@v4
+          with:
+            name: spartan_vulkan_${{ matrix.configuration == 'Release' && 'release' || 'debug' }}_${{ steps.get_datetime.outputs.version }}
+            path: spartan_vulkan_${{ matrix.configuration == 'Release' && 'release' || 'debug' }}_${{ steps.get_datetime.outputs.version }}.7z
 
   release:
     if: github.event_name != 'pull_request'
@@ -94,14 +102,14 @@ jobs:
       - name: Download vulkan release build
         uses: actions/download-artifact@v4
         with:
-          name: spartan_vulkan_release
-          path: spartan_vulkan_release.7z
+          name: spartan_vulkan_release_${{ needs.build.outputs.version }}
+          path: .
 
       - name: Download vulkan debug build
         uses: actions/download-artifact@v4
         with:
-          name: spartan_vulkan_debug
-          path: spartan_vulkan_debug.7z
+          name: spartan_vulkan_debug_${{ needs.build.outputs.version }}
+          path: .
 
       - name: Get date and time for versioning
         id: get_datetime