Merge pull request #3283 from radical-cybertools/fix/artifact_upload_…

…version `actions/artifact-upload@v3` is being retired
radical-cybertools · Dec 13, 2024 · c625004 · c625004
2 parents 2f82389 + 12bc290
commit c625004
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 13 deletions.
diff --git a/.github/workflows/ci-release.yml b/.github/workflows/ci-release.yml
@@ -68,8 +68,9 @@ jobs:
 
       - name: upload example_artifacts
         if:   always()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-            name: example_artifacts
+            name: example_artifacts_${{ matrix.python-version }}
             path: /home/runner/example_artifacts.tgz
+            overwrite: true
 
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -135,25 +135,27 @@ jobs:
           CLIENTNAME="analytics_client_$SIDCLIENT"
           AGENTNAME="analytics_agent_$SIDCLIENT"
           mkdir sessions_analytics
-          # tar cvfj $CLIENTNAME.tar.bz2 $SIDCLIENT
-          tar cvfj $CLIENTNAME.tar.bz2 `find $SIDCLIENT -type d -print`
+          # tar cfj $CLIENTNAME.tar.bz2 $SIDCLIENT
+          tar cfj $CLIENTNAME.tar.bz2 `find $SIDCLIENT -type d -print`
           cp -R $CLIENTNAME.tar.bz2 sessions_analytics
           if [ -d "$SIDAGENT" ]; then
-            tar cvfj $AGENTNAME.tar.bz2 `find $SIDAGENT -type d -print`
+            tar cfj $AGENTNAME.tar.bz2 `find $SIDAGENT -type d -print`
             cp -R $AGENTNAME.tar.bz2 sessions_analytics
           fi
       - name: Upload artifacts
         if: always()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-            name: artifacts
+            name: artifacts_${{ matrix.python-version }}
             path: artifacts
             retention-days: 5
+            overwrite: true
       - name: Upload sessions
         if: always()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-            name: sessions_analytics
+            name: sessions_analytics_${{ matrix.python-version }}
             path: sessions_analytics
             retention-days: 5
+            overwrite: true
 
diff --git a/.github/workflows/run-rp-notebook.yml b/.github/workflows/run-rp-notebook.yml
@@ -69,16 +69,17 @@ jobs:
           echo "CLIENTNAME : $CLIENTNAME"
           echo "AGENTNAME  : $AGENTNAME"
           mkdir sessions_notebooks
-          tar cvfj $CLIENTNAME.tar.bz2 $SIDCLIENT
+          tar cfj $CLIENTNAME.tar.bz2 $SIDCLIENT
           cp -R $CLIENTNAME.tar.bz2 sessions_notebooks
           if [ -d "$SIDAGENT" ]; then
-            tar cvfj $AGENTNAME.tar.bz2 $SIDAGENT
+            tar cfj $AGENTNAME.tar.bz2 $SIDAGENT
             cp -R $AGENTNAME.tar.bz2 sessions_notebooks
           fi
       - name: Upload sessions
         if: always()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-            name: sessions_notebooks
+            name: sessions_notebooks${{inputs.notebook-name}}_${{inputs.python-version}}
             path: sessions_notebooks
             retention-days: 5
+            overwrite: true