From b5ef298eee8fc91a832da5a55d05eccb303eb0b3 Mon Sep 17 00:00:00 2001
From: Vicente Adolfo Bolea Sanchez <vicente.bolea@kitware.com>
Date: Fri, 26 Jul 2024 18:00:25 -0400
Subject: [PATCH] ci: address gha warnings

---
 .github/workflows/everything.yml  | 30 +++++++++++++++---------------
 .github/workflows/pypackaging.yml |  9 +++++----
 2 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/everything.yml b/.github/workflows/everything.yml
index cb65501c4c..c723d5dd8a 100644
--- a/.github/workflows/everything.yml
+++ b/.github/workflows/everything.yml
@@ -65,7 +65,7 @@ jobs:
           ls -la *-changed-files.txt
           NUM_CHANGES=$(wc -l < filtered-changed-files.txt)
           echo "Number of files changed (filtered): ${NUM_CHANGES}"
-          echo "::set-output name=num_code_changes::${NUM_CHANGES}"
+          echo "num_code_changes=${NUM_CHANGES}" >> $GITHUB_OUTPUT
 
 #######################################
 # Formatting jobs
@@ -176,7 +176,7 @@ jobs:
           ref: ${{ github.event.pull_request.head.sha }}
           path: source
       - name: Restore cache
-        uses: actions/cache/restore@v3
+        uses: actions/cache/restore@v4
         id: restore-cache
         with:
           path: .ccache
@@ -196,7 +196,7 @@ jobs:
       - name: Print ccache statistics
         run: ccache -s | tee $GITHUB_STEP_SUMMARY
       - name: Save cache
-        uses: actions/cache/save@v3
+        uses: actions/cache/save@v4
         if: ${{ github.ref_name == 'master' && steps.restore-cache.outputs.cache-hit != 'true' }}
         id: save-cache
         with:
@@ -241,7 +241,7 @@ jobs:
           ref: ${{ github.event.pull_request.head.sha }}
           path: source
       - name: Restore cache
-        uses: actions/cache/restore@v3
+        uses: actions/cache/restore@v4
         id: restore-cache
         with:
           path: .ccache
@@ -261,7 +261,7 @@ jobs:
       - name: Print ccache statistics
         run: ccache -s
       - name: Save cache
-        uses: actions/cache/save@v3
+        uses: actions/cache/save@v4
         if: ${{ github.ref_name == 'master' && steps.restore-cache.outputs.cache-hit != 'true' }}
         id: save-cache
         with:
@@ -319,7 +319,7 @@ jobs:
       - name: Setup
         run: gha/scripts/ci/gh-actions/macos-setup.sh
       - name: Restore cache
-        uses: actions/cache/restore@v3
+        uses: actions/cache/restore@v4
         id: restore-cache
         with:
           path: .ccache
@@ -337,7 +337,7 @@ jobs:
       - name: Print ccache statistics
         run: ccache -s
       - name: Save cache
-        uses: actions/cache/save@v3
+        uses: actions/cache/save@v4
         if: ${{ github.ref_name == 'master' && steps.restore-cache.outputs.cache-hit != 'true' }}
         id: save-cache
         with:
@@ -410,7 +410,7 @@ jobs:
 #######################################
 
   docker:
-    needs: [format, git_checks]
+    needs: [ubuntu, el8, windows, macos]
     if: needs.git_checks.outputs.num_code_changes > 0
 
     runs-on: ubuntu-latest
@@ -444,7 +444,7 @@ jobs:
             docker save -o ci-docker.tar ornladios/adios2:ci-tmp
             ls -lah ci-docker.tar
       - name: Upload
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           retention-days: 1
           name: ci-docker ${{ matrix.baseos }} ${{ github.sha }}
@@ -475,7 +475,7 @@ jobs:
   # run steps lets the steps be written as though they too were using a
   # standard container job.
   contract:
-    needs: [format, git_checks, docker]
+    needs: [docker]
     if: needs.git_checks.outputs.num_code_changes > 0
 
     runs-on: ubuntu-latest
@@ -501,7 +501,7 @@ jobs:
           ref: ${{ matrix.ref }}
           path: source
       - name: Download CI docker image
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           name: ci-docker ubuntu-bionic ${{ github.sha }}
       - name: Initialize containers
@@ -531,7 +531,7 @@ jobs:
 #######################################
 
   analyze:
-    needs: [format, git_checks]
+    needs: [ubuntu, el8, windows, macos]
     name: CodeQL
     runs-on: ubuntu-latest
     container:
@@ -561,7 +561,7 @@ jobs:
         ref: ${{ github.event.pull_request.head.sha }}
         path: source
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v3
       with:
         languages: ${{ matrix.language }}
         config: |
@@ -578,7 +578,7 @@ jobs:
     - name: Build
       run: gha/scripts/ci/gh-actions/run.sh build
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v3
       with:
         category: "/language:${{matrix.language}}"
 
@@ -587,7 +587,7 @@ jobs:
 #######################################
 
   build_and_test:
-    needs: [el8, ubuntu, macos, docker, contract]
+    needs: [contract, analyze]
     runs-on: ubuntu-latest
     steps:
       - run: echo "All required jobs complete"
diff --git a/.github/workflows/pypackaging.yml b/.github/workflows/pypackaging.yml
index 022807108e..7629c50810 100644
--- a/.github/workflows/pypackaging.yml
+++ b/.github/workflows/pypackaging.yml
@@ -34,9 +34,10 @@ jobs:
       - name: Build SDist
         run: pipx run build --sdist
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           path: dist/*.tar.gz
+          overwrite: true
 
   build_wheels:
     name: Wheel on ${{ matrix.os }}
@@ -60,7 +61,7 @@ jobs:
           CIBW_BUILD: cp*-manylinux_x86_64
 
       - name: Upload wheels
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           path: wheelhouse/*.whl
 
@@ -77,7 +78,7 @@ jobs:
         github.event.action == 'published'
       )
     steps:
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
           name: artifact
           path: dist
@@ -94,7 +95,7 @@ jobs:
     # Upload to Test PyPI for every commit on main branch
     if: github.event_name == 'push' && github.event.ref == 'refs/heads/master'
     steps:
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
           name: artifact
           path: dist