From 7afdcec3341a744b13137f5e2229be00ebf798e1 Mon Sep 17 00:00:00 2001 From: Valentin Buira Date: Thu, 9 Jan 2025 13:41:10 +0100 Subject: [PATCH] bump to v4 attempt #3 --- .github/workflows/packages.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/packages.yml b/.github/workflows/packages.yml index 0be5951..47a9727 100644 --- a/.github/workflows/packages.yml +++ b/.github/workflows/packages.yml @@ -150,7 +150,13 @@ jobs: echo "geodiff version defined in python-api-client requires.txt $GEODIFF_VER_FROM_CLIENT does not equal $GEODIFF_VER from the workpackage file" exit 1; # or just warning?? fi - + - name: Merge Artifacts + uses: actions/upload-artifact/merge@v4 + with: + path: artifact-pygeodiff + pattern: artifact-pygeodiff-* + merge-multiple: true + - uses: actions/download-artifact@v4 with: name: artifact @@ -173,12 +179,7 @@ jobs: (cd output && zip -r9 ../mergin.zip Mergin/) - - name: Merge Artifacts - uses: actions/upload-artifact/merge@v4 - with: - path: artifact-pygeodiff - pattern: artifact-pygeodiff-* - merge-multiple: true + - uses: actions/upload-artifact@v4 with: name: Mergin