From c22d0f4b3d7626eab878d358f97f7852cf59a16c Mon Sep 17 00:00:00 2001 From: "Scott C. Livingston" Date: Tue, 3 Sep 2024 16:26:55 -0700 Subject: [PATCH 1/2] CI: upgrade upload-artifact, download-artifact Following deprecation notice at https://github.blog/changelog/2024-04-16-deprecation-notice-v3-of-the-artifact-actions/ --- .github/workflows/doctest.yml | 2 +- .github/workflows/os-blas-test-matrix.yml | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/doctest.yml b/.github/workflows/doctest.yml index edf1f16..62adc6f 100644 --- a/.github/workflows/doctest.yml +++ b/.github/workflows/doctest.yml @@ -38,7 +38,7 @@ jobs: make doctest - name: Archive results - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: doctest-output path: doc/_build/doctest/output.txt diff --git a/.github/workflows/os-blas-test-matrix.yml b/.github/workflows/os-blas-test-matrix.yml index 0a7bb9c..bbbdb40 100644 --- a/.github/workflows/os-blas-test-matrix.yml +++ b/.github/workflows/os-blas-test-matrix.yml @@ -91,7 +91,7 @@ jobs: mkdir -p ${wheeldir} cp ./slycot*.whl ${wheeldir}/ - name: Save wheel - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: slycot-wheels path: slycot-wheels @@ -142,7 +142,7 @@ jobs: done python -m conda_index ./slycot-conda-pkgs - name: Save to local conda pkg channel - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: slycot-conda-pkgs path: slycot-conda-pkgs @@ -159,7 +159,7 @@ jobs: - name: Checkout python-control uses: actions/checkout@v3 - name: Download wheels (if any) - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: slycot-wheels path: slycot-wheels @@ -178,7 +178,7 @@ jobs: - name: Checkout python-control uses: actions/checkout@v3 - name: Download conda packages - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: slycot-conda-pkgs path: slycot-conda-pkgs @@ -238,7 +238,7 @@ jobs: exit 1 ;; esac - name: Download wheels - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: slycot-wheels path: slycot-wheels @@ -290,7 +290,7 @@ jobs: channel-priority: strict auto-activate-base: false - name: Download conda packages - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: slycot-conda-pkgs path: slycot-conda-pkgs From 3d9baa1c77b4a1d714fa24e4008d739ace74b045 Mon Sep 17 00:00:00 2001 From: "Scott C. Livingston" Date: Tue, 3 Sep 2024 16:56:52 -0700 Subject: [PATCH 2/2] CI: unique upload names given immutability Reference: https://github.com/actions/download-artifact/blob/fa0a91b85d4f404e444e00e005971372dc801d16/docs/MIGRATION.md#multiple-uploads-to-the-same-named-artifact --- .github/workflows/os-blas-test-matrix.yml | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/.github/workflows/os-blas-test-matrix.yml b/.github/workflows/os-blas-test-matrix.yml index bbbdb40..fe57507 100644 --- a/.github/workflows/os-blas-test-matrix.yml +++ b/.github/workflows/os-blas-test-matrix.yml @@ -9,7 +9,7 @@ on: - .github/scripts/set-conda-pip-matrix.py - .github/conda-env/build-env.yml - .github/conda-env/test-env.yml - + jobs: build-pip: name: Build pip Py${{ matrix.python }}, ${{ matrix.os }}, ${{ matrix.bla_vendor}} BLA_VENDOR @@ -93,8 +93,9 @@ jobs: - name: Save wheel uses: actions/upload-artifact@v4 with: - name: slycot-wheels + name: slycot-wheels-${{ matrix.os }}-${{ matrix.python }}-${{ matrix.bla_vendor }} path: slycot-wheels + retention-days: 5 build-conda: @@ -144,8 +145,9 @@ jobs: - name: Save to local conda pkg channel uses: actions/upload-artifact@v4 with: - name: slycot-conda-pkgs + name: slycot-conda-pkgs-${{ matrix.os }}-${{ matrix.python }} path: slycot-conda-pkgs + retention-days: 5 create-wheel-test-matrix: @@ -156,6 +158,11 @@ jobs: outputs: matrix: ${{ steps.set-matrix.outputs.matrix }} steps: + - name: Merge artifacts + uses: actions/upload-artifact/merge@v4 + with: + name: slycot-wheels + pattern: slycot-wheels-* - name: Checkout python-control uses: actions/checkout@v3 - name: Download wheels (if any) @@ -175,6 +182,11 @@ jobs: outputs: matrix: ${{ steps.set-matrix.outputs.matrix }} steps: + - name: Merge artifacts + uses: actions/upload-artifact/merge@v4 + with: + name: slycot-conda-pkgs + pattern: slycot-conda-pkgs-* - name: Checkout python-control uses: actions/checkout@v3 - name: Download conda packages