From d4cd6c55d7e7c2de3e3e1d4883a53b00d6e1e02f Mon Sep 17 00:00:00 2001
From: "Brendan C. Ward" <bcward@astutespruce.com>
Date: Mon, 22 Jan 2024 19:33:12 -0800
Subject: [PATCH] WIP: update upload / download action filenames

---
 .github/workflows/release.yml | 75 +++++++++++++++++++----------------
 1 file changed, 41 insertions(+), 34 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 7f6a861f..b912ef9c 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -117,7 +117,9 @@ jobs:
 
       - uses: actions/upload-artifact@v4
         with:
+          name: pyogrio-wheel
           path: ./wheelhouse/*.whl
+          compression: 0
 
   build-wheels-mac-win:
     name: Build wheels on ${{ matrix.os }} (${{ matrix.arch }})
@@ -190,6 +192,7 @@ jobs:
         if: ${{ failure() }}
         uses: actions/upload-artifact@v4
         with:
+          name: pyogrio-vcpkg-logs-${{ matrix.triplet }}
           path: ${{ matrix.vcpkg_logs }}
 
       - name: Build wheels
@@ -199,9 +202,11 @@ jobs:
           VCPKG_DEFAULT_TRIPLET: ${{ matrix.triplet }}
           CIBW_ARCHS: ${{ matrix.arch }}
 
-      - uses: actions/upload-artifact@v
+      - uses: actions/upload-artifact@v4
         with:
+          name: pyogrio-wheel
           path: ./wheelhouse/*.whl
+          compression: 0
 
   test-wheels:
     name: Test wheels on ${{ matrix.os }} (Python ${{ matrix.python-version }})
@@ -228,7 +233,9 @@ jobs:
       - name: Download wheels from artifacts
         uses: actions/download-artifact@v4
         with:
+          name: pyogrio-wheel
           path: wheelhouse
+          merge-multiple: true
 
       - name: Install dependencies and pyogrio wheel
         shell: bash
@@ -247,36 +254,36 @@ jobs:
           python -c "import pyogrio; print(f'GDAL version: {pyogrio.__gdal_version__}\nGEOS version: {pyogrio.__gdal_geos_version__}')"
           python -m pytest --pyargs pyogrio.tests -v
 
-  publish:
-    name: Publish pyogrio to GitHub / PyPI
-    needs: [test-sdist, test-wheels]
-    runs-on: ubuntu-latest
-    environment:
-      name: pypi
-      url: https://pypi.org/p/pyogrio
-    permissions:
-      id-token: write # IMPORTANT: this permission is mandatory for trusted publishing to PyPI
-
-    # release on every tag
-    if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags/')
-
-    steps:
-      - uses: actions/download-artifact@v4
-        with:
-          name: artifact
-          path: dist
-
-      - name: Publish distribution to PyPI
-        uses: pypa/gh-action-pypi-publish@release/v1
-
-      - name: Create GitHub Release
-        id: create_release
-        uses: softprops/action-gh-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
-        with:
-          tag_name: ${{ github.ref }}
-          name: ${{ github.ref }}
-          draft: false
-          prerelease: false
-          files: dist/*.tar.gz
+  # publish:
+  #   name: Publish pyogrio to GitHub / PyPI
+  #   needs: [test-sdist, test-wheels]
+  #   runs-on: ubuntu-latest
+  #   environment:
+  #     name: pypi
+  #     url: https://pypi.org/p/pyogrio
+  #   permissions:
+  #     id-token: write # IMPORTANT: this permission is mandatory for trusted publishing to PyPI
+
+  #   # release on every tag
+  #   if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags/')
+
+  #   steps:
+  #     - uses: actions/download-artifact@v4
+  #       with:
+  #         name: artifact
+  #         path: dist
+
+  #     - name: Publish distribution to PyPI
+  #       uses: pypa/gh-action-pypi-publish@release/v1
+
+  #     - name: Create GitHub Release
+  #       id: create_release
+  #       uses: softprops/action-gh-release@v1
+  #       env:
+  #         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
+  #       with:
+  #         tag_name: ${{ github.ref }}
+  #         name: ${{ github.ref }}
+  #         draft: false
+  #         prerelease: false
+  #         files: dist/*.tar.gz