From: David Lord <davidism@gmail.com>
Date: Tue, 23 Apr 2024 23:22:41 +0000 (-0700)
Subject: Revert "upload/download-artifact v4"
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2a17038fcaeac554736d3771835f318f45fd8127;p=thirdparty%2Fjinja.git

Revert "upload/download-artifact v4"

This reverts commit c8aca7458715695d0b2aaa128f83d7dccf6e459f.
---

diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
index 28ee6f44..8742c66f 100644
--- a/.github/workflows/publish.yaml
+++ b/.github/workflows/publish.yaml
@@ -45,13 +45,11 @@ jobs:
       contents: write
     steps:
       - uses: actions/download-artifact@9c19ed7fe5d278cd354c7dfd5d3b88589c7e2395 # v4.1.6
-        with:
-          merge-multiple: true
       - name: create release
         run: >
           gh release create --draft --repo ${{ github.repository }}
           ${{ github.ref_name }}
-          *.intoto.jsonl/* dist/*
+          *.intoto.jsonl/* artifact/*
         env:
           GH_TOKEN: ${{ github.token }}
   publish-pypi:
@@ -66,12 +64,10 @@ jobs:
       id-token: write
     steps:
       - uses: actions/download-artifact@9c19ed7fe5d278cd354c7dfd5d3b88589c7e2395 # v4.1.6
-        with:
-          merge-multiple: true
       - uses: pypa/gh-action-pypi-publish@81e9d935c883d0b210363ab89cf05f3894778450 # v1.8.14
         with:
           repository-url: https://test.pypi.org/legacy/
-          packages-dir: dist/
+          packages-dir: artifact/
       - uses: pypa/gh-action-pypi-publish@81e9d935c883d0b210363ab89cf05f3894778450 # v1.8.14
         with:
-          packages-dir: dist/
+          packages-dir: artifact/