From d1efb93ca7607f723c15eedc136ce2f0bc7d8800 Mon Sep 17 00:00:00 2001 From: Vicente Adolfo Bolea Sanchez Date: Fri, 26 Jul 2024 18:00:25 -0400 Subject: [PATCH] ci: address gha warnings --- .github/workflows/everything.yml | 22 +++++++++++----------- .github/workflows/pypackaging.yml | 8 ++++---- scripts/ci/gh-actions/macos-setup.sh | 4 +--- 3 files changed, 16 insertions(+), 18 deletions(-) diff --git a/.github/workflows/everything.yml b/.github/workflows/everything.yml index 8b413719e1..a33d267498 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: @@ -312,7 +312,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 @@ -330,7 +330,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: @@ -433,7 +433,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 }} @@ -490,7 +490,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 @@ -550,7 +550,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: | @@ -567,7 +567,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}}" diff --git a/.github/workflows/pypackaging.yml b/.github/workflows/pypackaging.yml index 022807108e..6a0a76ccf9 100644 --- a/.github/workflows/pypackaging.yml +++ b/.github/workflows/pypackaging.yml @@ -34,7 +34,7 @@ jobs: - name: Build SDist run: pipx run build --sdist - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: path: dist/*.tar.gz @@ -60,7 +60,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 +77,7 @@ jobs: github.event.action == 'published' ) steps: - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: name: artifact path: dist @@ -94,7 +94,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 diff --git a/scripts/ci/gh-actions/macos-setup.sh b/scripts/ci/gh-actions/macos-setup.sh index 0eb6850f20..73a3705e39 100755 --- a/scripts/ci/gh-actions/macos-setup.sh +++ b/scripts/ci/gh-actions/macos-setup.sh @@ -34,15 +34,13 @@ echo "Installing CMake" echo "Installing Ninja" brew install ninja -echo "Installing GCC" -brew install gcc sudo ln -v -s "$(which gfortran-11)" /usr/local/bin/gfortran echo "Installing blosc compression" brew install c-blosc echo "Installing python3" -brew install python numpy +brew install numpy echo "Installing ccache" brew install ccache