From 1c7cf378a175e5416c558c0f1367803532a2bd66 Mon Sep 17 00:00:00 2001 From: eitsupi Date: Sat, 17 Feb 2024 06:14:17 +0000 Subject: [PATCH 1/3] ci: migrate to actions/upload-artifact@v4 --- .github/workflows/check.yaml | 4 ++-- .github/workflows/release-lib.yaml | 4 ++-- .github/workflows/release.yaml | 6 ++++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/check.yaml b/.github/workflows/check.yaml index 8d0f6667e..1edcd5cc0 100644 --- a/.github/workflows/check.yaml +++ b/.github/workflows/check.yaml @@ -125,9 +125,9 @@ jobs: - name: upload artifact if: matrix.config.full-features - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: - name: libs + name: checked-lib-${{ steps.rust-target.outputs.TARGET }} path: ${{ env.LIBR_POLARS_PATH }} source-with-bin-check: diff --git a/.github/workflows/release-lib.yaml b/.github/workflows/release-lib.yaml index 62e6cbef6..93e6811a1 100644 --- a/.github/workflows/release-lib.yaml +++ b/.github/workflows/release-lib.yaml @@ -92,9 +92,9 @@ jobs: echo "ARTIFACT_NAME=${ARTIFACT_NAME}" >>"$GITHUB_ENV" - name: upload artifact - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: - name: libs + name: libs-${{ matrix.target }} path: ${{ env.ARTIFACT_NAME }} test: diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index b40a91c30..e6f3c54a4 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -31,7 +31,7 @@ jobs: build: runs-on: ${{ matrix.config.os }} - name: ${{ matrix.config.os }} (${{ matrix.config.r }}) - ${{ matrix.config.target }} + name: ${{ matrix.config.os }} (${{ matrix.config.r }}) permissions: contents: write @@ -96,8 +96,10 @@ jobs: mv ../polars* ./ - name: Upload produced R packages - uses: actions/upload-artifact@v3 + if: runner.os != 'Windows' + uses: actions/upload-artifact@v4 with: + name: package-${{ matrix.config.os }}-${{ matrix.config.r }} path: | polars_* polars.zip From e5b20e560bb1324f90501965a000168a6620c711 Mon Sep 17 00:00:00 2001 From: eitsupi Date: Sat, 17 Feb 2024 06:18:36 +0000 Subject: [PATCH 2/3] ci: migrate to actions/download-artifact@v4 --- .github/workflows/release-lib.yaml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/release-lib.yaml b/.github/workflows/release-lib.yaml index 93e6811a1..02f169498 100644 --- a/.github/workflows/release-lib.yaml +++ b/.github/workflows/release-lib.yaml @@ -128,11 +128,6 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: actions/download-artifact@v3 - with: - name: libs - path: libs - - name: prep Rust working-directory: src/rust run: | @@ -145,6 +140,11 @@ jobs: fi rm "$(rustup which cargo)" + - uses: actions/download-artifact@v4 + with: + name: libs-${{ env.LIB_TARGET }} + path: libs + - name: prep lib run: | ARTIFACT_NAME="${LIB_NAME}-${LIB_VERSION}-${LIB_TARGET}.tar.gz" @@ -186,10 +186,12 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: name: libs path: libs + pattern: libs-* + merge-multiple: true - name: create checksums working-directory: libs From 942ce200d32fa71a8d44a75f1eb9a12da271afa3 Mon Sep 17 00:00:00 2001 From: eitsupi Date: Sat, 17 Feb 2024 06:21:29 +0000 Subject: [PATCH 3/3] ci: remove unused condition check --- .github/workflows/release.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index e6f3c54a4..a2a51b311 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -96,7 +96,6 @@ jobs: mv ../polars* ./ - name: Upload produced R packages - if: runner.os != 'Windows' uses: actions/upload-artifact@v4 with: name: package-${{ matrix.config.os }}-${{ matrix.config.r }}