Merge branch 'master' into free-threading-support

aio-libs · Sep 22, 2024 · 9b79f76 · 9b79f76
2 parents e64c5a8 + e07ae9d
commit 9b79f76
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 14 deletions.
diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml
@@ -95,7 +95,7 @@ jobs:
  }
  >> "${GITHUB_OUTPUT}"
  - name: Upload built artifacts for testing
- uses: actions/upload-artifact@v3
+ uses: actions/upload-artifact@v4
  with:
  if-no-files-found: error
  name: ${{ needs.pre-setup.outputs.dists-artifact-name }}
@@ -181,17 +181,18 @@ jobs:
 
  steps:
  - name: Retrieve the project source from an sdist inside the GHA artifact
- uses: re-actors/checkout-python-sdist@release/v1
+ uses: re-actors/checkout-python-sdist@release/v2
  with:
  source-tarball-name: >-
  ${{ needs.build-pure-python-dists.outputs.sdist-filename }}
  workflow-artifact-name: >-
  ${{ needs.pre-setup.outputs.dists-artifact-name }}
  - name: Download distributions
  if: ${{ !endsWith(matrix.pyver, '-dev') && true || false }}
- uses: actions/download-artifact@v3
+ uses: actions/download-artifact@v4
  with:
- name: ${{ needs.pre-setup.outputs.dists-artifact-name }}
+ pattern: ${{ needs.pre-setup.outputs.dists-artifact-name }}*
+ merge-multiple: true
  path: dist
 
  - name: Setup Python ${{ matrix.pyver }}
@@ -328,7 +329,7 @@ jobs:
  # combining Linux and Windows paths is tricky, left this exercise for
  # others multidict has no Windows or macOS specific code paths anyway
  if: ${{ matrix.os == 'ubuntu' }}
- uses: aio-libs/prepare-coverage@v22.1.2
+ uses: aio-libs/prepare-coverage@v24.9.2
 
  test-summary:
  name: Tests status
@@ -346,16 +347,17 @@ jobs:
  with:
  jobs: ${{ toJSON(needs) }}
  - name: Retrieve the project source from an sdist inside the GHA artifact
- uses: re-actors/checkout-python-sdist@release/v1
+ uses: re-actors/checkout-python-sdist@release/v2
  with:
  source-tarball-name: >-
  ${{ needs.build-pure-python-dists.outputs.sdist-filename }}
  workflow-artifact-name: >-
  ${{ needs.pre-setup.outputs.dists-artifact-name }}
  - name: Download artifacts
- uses: actions/download-artifact@v3
+ uses: actions/download-artifact@v4
  with:
- name: coverage
+ pattern: coverage*
+ merge-multiple: true
  path: ${{ runner.temp }}/coverage
  - name: Install coverage
  run: |
@@ -430,17 +432,18 @@ jobs:
 
  steps:
  - name: Retrieve the project source from an sdist inside the GHA artifact
- uses: re-actors/checkout-python-sdist@release/v1
+ uses: re-actors/checkout-python-sdist@release/v2
  with:
  source-tarball-name: >-
  ${{ needs.build-pure-python-dists.outputs.sdist-filename }}
  workflow-artifact-name: >-
  ${{ needs.pre-setup.outputs.dists-artifact-name }}
 
  - name: Download distributions
- uses: actions/download-artifact@v3
+ uses: actions/download-artifact@v4
  with:
- name: ${{ needs.pre-setup.outputs.dists-artifact-name }}
+ pattern: ${{ needs.pre-setup.outputs.dists-artifact-name }}*
+ merge-multiple: true
  path: dist
  - run: |
  tree

diff --git a/.github/workflows/reusable-build-wheel.yml b/.github/workflows/reusable-build-wheel.yml
@@ -42,7 +42,7 @@ jobs:
  timeout-minutes: ${{ inputs.qemu && 47 || 14 }}
  steps:
  - name: Retrieve the project source from an sdist inside the GHA artifact
- uses: re-actors/checkout-python-sdist@release/v1
+ uses: re-actors/checkout-python-sdist@release/v2
  with:
  source-tarball-name: ${{ inputs.source-tarball-name }}
  workflow-artifact-name: ${{ inputs.dists-artifact-name }}
@@ -73,9 +73,10 @@ jobs:
  CIBW_ARCHS_MACOS: x86_64 arm64 universal2
 
  - name: Upload built artifacts for testing and publishing
- uses: actions/upload-artifact@v3
+ uses: actions/upload-artifact@v4
  with:
- name: ${{ inputs.dists-artifact-name }}
+ name: >-
+ ${{ inputs.dists-artifact-name }}-${{ inputs.os }}-${{ inputs.qemu }}
  path: ./wheelhouse/*.whl
 
 ...