delete unnecessary artifacts

tjko · Jul 27, 2024 · c7d0dec · c7d0dec
1 parent 71a77c7
commit c7d0dec
Showing 1 changed file with 19 additions and 11 deletions.
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
@@ -59,7 +59,7 @@ jobs:
     - name: Check Source Version
       id: version-check
       run: |
-        ver=$(awk '/FANPICO_VERSION[[:space:]]/ { gsub(/\"/,""); print $3; exit; }' main/build/config.h)
+        ver=$(awk '/FANPICO_VERSION[[:space:]]/ { gsub(/"/,""); print $3; exit; }' main/build/config.h)
         echo "FANPICO_VERSION=$ver" >> $GITHUB_ENV
         echo "FANPICO_VERSION=$ver" >> $GITHUB_OUTPUT
         date=$(date +%Y%m%d)
@@ -100,13 +100,6 @@ jobs:
 
     steps:
 
-#    - name: Merge Artifacts
-#      uses: actions/upload-artifact/merge@v4
-#      with:
-#        name: fanpico-firmware-${{github.run_number}}-${{github.sha}}
-#        pattern: firmware-*
-#        delete-merged: true
-
     - name: Download All Artifacts
       uses: actions/download-artifact@v4
       with:
@@ -118,13 +111,28 @@ jobs:
       working-directory: bundle
       run: |
         sha256sum * > sha256sums.txt
+        ls -la
         echo "### Generated firmware files" >> $GITHUB_STEP_SUMMARY
-        ls -la >> $GITHUB_STEP_SUMMARY
+        echo "```" >> $GITHUB_STEP_SUMMARY
         cat sha256sums.txt >> $GITHUB_STEP_SUMMARY
+        echo "```" >> $GITHUB_STEP_SUMMARY
 
-    - name: Upload Final Artifact
+    - name: Upload checksum artifact
       uses: actions/upload-artifact@v4
+      with:
+        name: firmware-checksums
+        path: bundle/*.txt
+
+    - name: Merge Artifacts
+      uses: actions/upload-artifact/merge@v4
       with:
         name: fanpico-firmware-${{env.FANPICO_VERSION}}-build${{github.run_number}}-${{env.BUILD_DATE}}
-        path: bundle
+        pattern: firmware-*
+        delete-merged: true
+
+#    - name: Upload Final Artifact
+#      uses: actions/upload-artifact@v4
+#      with:
+#        name: fanpico-firmware-${{env.FANPICO_VERSION}}-build${{github.run_number}}-${{env.BUILD_DATE}}
+#        path: bundle