From 14b6aed53ce11d0971807e916b9048b3f74860e3 Mon Sep 17 00:00:00 2001 From: past-due <30942300+past-due@users.noreply.github.com> Date: Wed, 14 Feb 2024 21:48:15 -0500 Subject: [PATCH] [GitHub Actions] Bump actions/(upload|download)-artifact to v4 --- .github/workflows/CI_emscripten.yml | 4 ++-- .github/workflows/CI_flatpak.yml | 16 +++++++-------- .github/workflows/CI_macos.yml | 10 +++++----- .github/workflows/CI_snapcraft.yml | 2 +- .github/workflows/CI_ubuntu.yml | 8 ++++---- .github/workflows/CI_windows.yml | 20 +++++++++---------- .../workflows/generate_snap_stable_config.yml | 4 ++-- .github/workflows/publish_web_build.yml | 2 +- 8 files changed, 33 insertions(+), 33 deletions(-) diff --git a/.github/workflows/CI_emscripten.yml b/.github/workflows/CI_emscripten.yml index aa49d3be602..bf4bed5d0f2 100644 --- a/.github/workflows/CI_emscripten.yml +++ b/.github/workflows/CI_emscripten.yml @@ -146,7 +146,7 @@ jobs: echo "WZ_FULL_OUTPUT_ZIP_PATH=${OUTPUT_DIR}/${OUTPUT_FILE_NAME}" >> $GITHUB_ENV - name: 'Upload Artifact - (Archive)' - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 if: success() && (matrix.upload_artifact == true) && (github.repository == 'Warzone2100/warzone2100') with: name: warzone2100_${{ env.WZ_BUILD_DESC }}_archive @@ -171,7 +171,7 @@ jobs: - name: Prep Environment run: mkdir dl-archive - name: Download Archive Artifact - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: 'warzone2100_${{ env.WZ_BUILD_DESC }}_archive' path: ./dl-archive diff --git a/.github/workflows/CI_flatpak.yml b/.github/workflows/CI_flatpak.yml index c5651b06785..b0ce5fabf64 100644 --- a/.github/workflows/CI_flatpak.yml +++ b/.github/workflows/CI_flatpak.yml @@ -246,12 +246,12 @@ jobs: ############################################################### # Upload the .flatpak and debugsymbols artifacts - name: Upload Artifact - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: 'warzone2100_linux_flatpak_${{ matrix.arch }}' path: ${{ steps.settings.outputs.WZ_FLATPAK_BUNDLE }} - name: Upload debug info - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: 'debugsymbols_linux_flatpak_${{ matrix.arch }}' path: | @@ -275,7 +275,7 @@ jobs: objdump -p flatpak_app/files/bin/warzone2100 | grep NEEDED | grep -E -v 'linux-vdso|ld-linux-' | awk 'NF == 2 { system("echo " $2 " && cp /var/lib/flatpak/runtime/org.freedesktop.Platform/${WZ_FLATPAK_TARGET_ARCH}/${WZ_FREEDESKTOP_RUNTIME_VERSION}/active/files/lib/${WZ_FLATPAK_TARGET_ARCH}-linux-gnu/" $2 " output_debug_dependency_snapshot") }' fi - name: Upload additional debug dependency info - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: 'debugdependencylibsnapshot_linux_flatpak_${{ matrix.arch }}' path: | @@ -299,7 +299,7 @@ jobs: echo " -> Size (bytes): $(stat -c %s "${REPO_TAR_FILE}")" - name: Upload ostree repo if: success() && (github.event_name == 'release' && github.event.action == 'published') - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: 'ostree_repo_flatpak_${{ matrix.arch }}_${{ steps.settings.outputs.WZ_FLATPAK_BRANCH }}' path: '${{ steps.repo-tar.outputs.REPO_TAR_FILE }}' @@ -327,12 +327,12 @@ jobs: mkdir -p dl-debug/symbols mkdir -p dl-debug/additional - name: Download Debug Symbols - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: 'debugsymbols_linux_flatpak_${{ matrix.arch }}' path: ./dl-debug/symbols - name: Download Additional Debug Files - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: 'debugdependencylibsnapshot_linux_flatpak_${{ matrix.arch }}' path: ./dl-debug/additional @@ -372,7 +372,7 @@ jobs: run: | mkdir dl-artifacts - name: Download Artifacts - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: 'warzone2100_linux_flatpak_${{ matrix.arch }}' path: ./dl-artifacts @@ -452,7 +452,7 @@ jobs: run: | mkdir dl-artifacts - name: Download Artifacts - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: 'ostree_repo_flatpak_${{ matrix.arch }}_${{ needs.build-flatpak.outputs.WZ_FLATPAK_BRANCH }}' path: ./dl-artifacts diff --git a/.github/workflows/CI_macos.yml b/.github/workflows/CI_macos.yml index 9bf3a961faa..f9b74c2ef88 100644 --- a/.github/workflows/CI_macos.yml +++ b/.github/workflows/CI_macos.yml @@ -201,7 +201,7 @@ jobs: echo "WZ_FULL_OUTPUT_ZIP_PATH=${OUTPUT_DIR}/${DESIRED_ZIP_NAME}" >> $GITHUB_ENV exit 0 - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 if: success() && (matrix.publish_artifact == true) with: name: "warzone2100_macOS_${{ matrix.artifact_suffix }}" @@ -235,7 +235,7 @@ jobs: echo "OUTPUT_DIR=output" >> $GITHUB_ENV - name: Download Artifacts - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: path: ./dl-artifacts - name: Display structure of downloaded files @@ -293,7 +293,7 @@ jobs: echo "WZ_FULL_OUTPUT_ZIP_PATH=${OUTPUT_DIR}/${DESIRED_ZIP_NAME}" >> $GITHUB_ENV exit 0 - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: name: "warzone2100_macOS_universal" path: ${{ env.WZ_FULL_OUTPUT_ZIP_PATH }} @@ -351,7 +351,7 @@ jobs: echo "WZ_FULL_OUTPUT_ZIP_PATH=${OUTPUT_DIR}/${DESIRED_ZIP_NAME}" >> $GITHUB_ENV exit 0 - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: name: "warzone2100_macOS_universal_novideos" path: ${{ env.WZ_FULL_OUTPUT_ZIP_PATH }} @@ -383,7 +383,7 @@ jobs: run: | mkdir dl-archive - name: Download Artifacts - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: 'warzone2100_macOS_universal_novideos' path: ./dl-archive diff --git a/.github/workflows/CI_snapcraft.yml b/.github/workflows/CI_snapcraft.yml index c3b868c8103..f7c18f0ff05 100644 --- a/.github/workflows/CI_snapcraft.yml +++ b/.github/workflows/CI_snapcraft.yml @@ -112,7 +112,7 @@ jobs: echo " -> SHA512: $(sha512sum "${OUTPUT_DIR}/${OUTPUT_FILE_NAME}")" echo " -> Size (bytes): $(stat -c %s "${OUTPUT_DIR}/${OUTPUT_FILE_NAME}")" echo "WZ_FULL_OUTPUT_SNAP_PATH=${OUTPUT_DIR}/${OUTPUT_FILE_NAME}" >> $GITHUB_ENV - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 if: success() with: name: 'warzone2100_linux_${{ matrix.arch }}_snap' diff --git a/.github/workflows/CI_ubuntu.yml b/.github/workflows/CI_ubuntu.yml index b18a2904e71..0f5a6c32b3b 100644 --- a/.github/workflows/CI_ubuntu.yml +++ b/.github/workflows/CI_ubuntu.yml @@ -174,7 +174,7 @@ jobs: echo " -> SHA512: $(sha512sum "${OUTPUT_DIR}/${OUTPUT_FILE_NAME}")" echo " -> Size (bytes): $(stat -c %s "${OUTPUT_DIR}/${OUTPUT_FILE_NAME}")" echo "WZ_FULL_OUTPUT_DEB_PATH=${OUTPUT_DIR}/${OUTPUT_FILE_NAME}" >> $GITHUB_ENV - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 if: success() && (matrix.publish_artifact == true) with: name: "warzone2100_${{ matrix.output-suffix }}_${{ matrix.arch }}_deb" @@ -188,7 +188,7 @@ jobs: WZ_EXECUTABLE_PATH="${WZ_BUILD_DIR}/src/warzone2100${WZ_OUTPUT_NAME_SUFFIX}" objcopy --only-keep-debug "${WZ_EXECUTABLE_PATH}" "warzone2100${WZ_OUTPUT_NAME_SUFFIX}.debug" - name: Upload debug info - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 if: success() && (matrix.publish_artifact == true) with: name: 'debugsymbols_${{ matrix.output-suffix }}_${{ matrix.arch }}' @@ -273,7 +273,7 @@ jobs: echo "Generated warzone2100 tarball: \"warzone2100_src.tar.xz\"" echo " -> SHA512: $(sha512sum "${OUTPUT_DIR}/warzone2100_src.tar.xz")" echo " -> Size (bytes): $(stat -c %s "${OUTPUT_DIR}/warzone2100_src.tar.xz")" - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 if: success() with: name: warzone2100_src @@ -310,7 +310,7 @@ jobs: run: | mkdir dl-debug-symbols - name: Download Artifacts - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: 'debugsymbols_${{ matrix.output-suffix }}_${{ matrix.arch }}' path: ./dl-debug-symbols diff --git a/.github/workflows/CI_windows.yml b/.github/workflows/CI_windows.yml index 9354f67dff6..c0441f72899 100644 --- a/.github/workflows/CI_windows.yml +++ b/.github/workflows/CI_windows.yml @@ -534,7 +534,7 @@ jobs: & "${env:WZ_FULL_CMAKE_PATH}\cmake.exe" -DCMAKE_C_COMPILER="${env:WZ_MINGW_PKG_PREFIX}-gcc" -DCMAKE_CXX_COMPILER="${env:WZ_MINGW_PKG_PREFIX}-g++" -DCMAKE_RC_COMPILER="${env:WZ_MINGW_PKG_PREFIX}-windres" -DCMAKE_ASM_MASM_COMPILER="${env:WZ_ASM_MASM_COMPILER}" -DWZ_MINGW_DIST_PATH="${env:WZ_MINGW_DIST_PATH}" -DCMAKE_TOOLCHAIN_FILE="${{ github.workspace }}\build\vcpkg\scripts\buildsystems\vcpkg.cmake" -DCMAKE_BUILD_TYPE=Release -DWZ_DISTRIBUTOR:STRING="${env:WZ_DISTRIBUTOR}" -DDISCORD_RPC_APPID:STRING="${env:DISCORD_RPC_APPID}" -DWZ_BUILD_SENTRY:BOOL=${WZ_BUILD_SENTRY_VALUE} ${SENTRY_DSN_PARAM} ${SENTRY_BACKEND_PARAM} -G "Ninja" "${{ steps.settings.outputs.WZ_REPO_PATH }}" echo "::remove-matcher owner=cmake::" - name: Upload vcpkg logs (on failure) - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 if: failure() with: name: win_${{ matrix.architecture }}_vcpkg_logs @@ -582,7 +582,7 @@ jobs: Copy-Item -LiteralPath "$NSIS_Log" -Destination ".\output\error_logs" } - name: Upload Failure Logs Artifact - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 if: failure() with: name: win_${{ matrix.architecture }}_error_logs @@ -634,28 +634,28 @@ jobs: # Upload build artifacts ##################################################### - name: 'Upload Artifact - (Portable Build)' - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 if: success() && (github.repository == 'Warzone2100/warzone2100') with: name: warzone2100_${{ steps.settings.outputs.WZ_BUILD_DESC }}_portable path: '${{ github.workspace }}\output\portable' if-no-files-found: 'error' - name: 'Upload Artifact - (Regular Installer)' - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 if: success() && (github.repository == 'Warzone2100/warzone2100') with: name: warzone2100_${{ steps.settings.outputs.WZ_BUILD_DESC }}_installer path: '${{ github.workspace }}\output\installer' if-no-files-found: 'error' - name: 'Upload Artifact - (Debug Symbols)' - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 if: success() && (github.repository == 'Warzone2100/warzone2100') with: name: warzone2100_${{ steps.settings.outputs.WZ_BUILD_DESC }}_DEBUGSYMBOLS path: '${{ github.workspace }}\output\debugsymbols' if-no-files-found: 'error' - name: 'Upload Artifact - (Archive)' - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 if: success() && ((github.event_name == 'push' && github.ref == 'refs/heads/master') || (github.event_name == 'workflow_run' && github.event.workflow_run.name == 'Draft Tag Release')) && (matrix.deploy_release == true) && (github.repository == 'Warzone2100/warzone2100') with: name: warzone2100_${{ steps.settings.outputs.WZ_BUILD_DESC }}_archive @@ -713,7 +713,7 @@ jobs: Get-ChildItem -Path "${env:SOURCE_BUNDLE_OUTPUT_DIR}" -Recurse - name: Upload Sentry source bundles if: success() && (github.repository == 'Warzone2100/warzone2100') && (matrix.support_sentry == true) && (steps.settings.outputs.WZ_ENABLE_SENTRY == 'true') && (steps.create-sentry-source-bundle.outcome == 'success') - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: 'warzone2100_${{ steps.settings.outputs.WZ_BUILD_DESC }}_debug_sourcebundles' path: '${{ github.workspace }}\output\sentry_source_bundles' @@ -746,7 +746,7 @@ jobs: echo "OUTPUTDIR=${OUTPUTDIR}" >> $GITHUB_ENV echo "ARCHIVEDIR=${OUTPUTDIR}" >> $GITHUB_OUTPUT - name: Download Archive Artifact - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: 'warzone2100_win_${{ matrix.architecture }}_archive' path: ./dl-archive @@ -756,7 +756,7 @@ jobs: unzip -o "${ZIPFILE}" -d "${OUTPUTDIR}" && rm "${ZIPFILE}" - name: Download Debug Symbols Artifact continue-on-error: true - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: 'warzone2100_win_${{ matrix.architecture }}_DEBUGSYMBOLS' path: ./dl-archive @@ -775,7 +775,7 @@ jobs: fi - name: Download Source Bundle continue-on-error: true - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: 'warzone2100_win_${{ matrix.architecture }}_debug_sourcebundles' path: ./dl-sourcebundle diff --git a/.github/workflows/generate_snap_stable_config.yml b/.github/workflows/generate_snap_stable_config.yml index bf3077e1160..ff145aea2c5 100644 --- a/.github/workflows/generate_snap_stable_config.yml +++ b/.github/workflows/generate_snap_stable_config.yml @@ -179,7 +179,7 @@ jobs: echo "snapstablebuild.diff (SHA512: ${DIFF_HASH}):" cat "${{ github.workspace }}/diff/snapstablebuild.diff" - name: Upload diff artifact - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 if: success() && (github.repository == 'Warzone2100/warzone2100') && (steps.commit-snap-changes.outputs.PROCESS_DEPLOYMENT == 'true') with: name: snap_stable_build_diff @@ -202,7 +202,7 @@ jobs: path: snap-stable-build ssh-key: '${{ secrets.SNAP_STABLE_BUILD_REPO_GH_DEPLOY_KEY }}' - name: Fetch Snap Stable Config Changes - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: snap_stable_build_diff path: '${{ github.workspace }}/diff' diff --git a/.github/workflows/publish_web_build.yml b/.github/workflows/publish_web_build.yml index b3dac442f34..076ab920081 100644 --- a/.github/workflows/publish_web_build.yml +++ b/.github/workflows/publish_web_build.yml @@ -77,7 +77,7 @@ jobs: echo "WZ_UPLOAD_PATH=${WZ_UPLOAD_PATH}" >> $GITHUB_ENV echo "WZ_UPLOAD_PATH=${WZ_UPLOAD_PATH}" >> $GITHUB_OUTPUT - name: Download Archive Artifact - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: '${{ inputs.artifact }}' path: ./dl-archive