From 19fc487cead685dbf35ac10cb75bce116528bb04 Mon Sep 17 00:00:00 2001 From: bashonly Date: Sat, 10 Feb 2024 20:10:46 -0600 Subject: [PATCH] [build] Bump `actions/upload-artifact` to v4 and adjust workflows Authored by: bashonly --- .github/workflows/build.yml | 56 +++++++++++++++++++++++++++++------ .github/workflows/release.yml | 5 +++- 2 files changed, 51 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1792292d2351..42e87513508a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -163,13 +163,15 @@ jobs: done - name: Upload artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: + name: artifact-${{ github.job }} path: | yt-dlp yt-dlp.tar.gz yt-dlp_linux yt-dlp_linux.zip + compression-level: 0 linux_arm: needs: process @@ -224,10 +226,12 @@ jobs: fi - name: Upload artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: + name: artifact-${{ github.job }}-${{ matrix.architecture }} path: | # run-on-arch-action designates armv7l as armv7 repo/dist/yt-dlp_linux_${{ (matrix.architecture == 'armv7' && 'armv7l') || matrix.architecture }} + compression-level: 0 macos: needs: process @@ -266,11 +270,13 @@ jobs: [[ "$version" != "$downgraded_version" ]] - name: Upload artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: + name: artifact-${{ github.job }} path: | dist/yt-dlp_macos dist/yt-dlp_macos.zip + compression-level: 0 macos_legacy: needs: process @@ -317,10 +323,12 @@ jobs: [[ "$version" != "$downgraded_version" ]] - name: Upload artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: + name: artifact-${{ github.job }} path: | dist/yt-dlp_macos_legacy + compression-level: 0 windows: needs: process @@ -364,12 +372,14 @@ jobs: } - name: Upload artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: + name: artifact-${{ github.job }} path: | dist/yt-dlp.exe dist/yt-dlp_min.exe dist/yt-dlp_win.zip + compression-level: 0 windows32: needs: process @@ -410,10 +420,12 @@ jobs: } - name: Upload artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: + name: artifact-${{ github.job }} path: | dist/yt-dlp_x86.exe + compression-level: 0 meta_files: if: inputs.meta_files && always() && !cancelled() @@ -427,7 +439,11 @@ jobs: - windows32 runs-on: ubuntu-latest steps: - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 + with: + path: artifact + pattern: artifact-* + merge-multiple: true - name: Make SHA2-SUMS files run: | @@ -462,8 +478,30 @@ jobs: done - name: Upload artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: + name: artifact-${{ github.job }} path: | - SHA*SUMS* _update_spec + SHA*SUMS* + compression-level: 0 + + merge: + if: always() && !cancelled() + needs: + - process + - unix + - linux_arm + - macos + - macos_legacy + - windows + - windows32 + - meta_files + runs-on: ubuntu-latest + steps: + - name: Merge artifacts + uses: actions/upload-artifact/merge@v4 + with: + name: build-artifact + pattern: artifact-* + compression-level: 0 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 23b20563f1f2..3dea33079232 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -297,7 +297,10 @@ jobs: - uses: actions/checkout@v4 with: fetch-depth: 0 - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 + with: + name: build-artifact + path: artifact - uses: actions/setup-python@v5 with: python-version: "3.10"