From 60db080c8ba434b7ce6480f19417ac3143656baa Mon Sep 17 00:00:00 2001 From: Valentin Buira Date: Thu, 9 Jan 2025 13:22:06 +0100 Subject: [PATCH 1/5] bump upload and download artifact --- .github/workflows/packages.yml | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/.github/workflows/packages.yml b/.github/workflows/packages.yml index b291c6c..ea73369 100644 --- a/.github/workflows/packages.yml +++ b/.github/workflows/packages.yml @@ -47,7 +47,7 @@ jobs: patchelf --replace-needed ${SQLITE_LIB} libsqlite3.so.0 ./pygeodiff-binaries/libpygeodiff-${GEODIFF_VER}-python.so patchelf --remove-rpath ./pygeodiff-binaries/libpygeodiff-${GEODIFF_VER}-python.so - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: path: ./pygeodiff-binaries/*.so @@ -75,7 +75,7 @@ jobs: unzip -o pygeodiff-$env:GEODIFF_VER-cp$env:PYTHON_VER-cp$env:PYTHON_VER-win_amd64.whl -d tmp64 copy tmp64\pygeodiff\*.pyd pygeodiff-binaries\ - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: path: ./pygeodiff-binaries/*.pyd @@ -109,7 +109,7 @@ jobs: exit 1 fi - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: path: ./pygeodiff-binaries/*.dylib @@ -148,7 +148,7 @@ jobs: exit 1; # or just warning?? fi - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: name: artifact path: pygeodiff-binaries @@ -169,7 +169,12 @@ jobs: cp qgis-mergin-plugin/LICENSE.txt output/Mergin/LICENSE (cd output && zip -r9 ../mergin.zip Mergin/) - - uses: actions/upload-artifact@v3 + + - name: Merge Artifacts + uses: actions/upload-artifact/merge@v4 + with: + pattern: ./pygeodiff-binaries/* + - uses: actions/upload-artifact@v4 with: name: Mergin path: output/ From 65bd59bdc7c8547b37f14526a942397e1ba67d80 Mon Sep 17 00:00:00 2001 From: Valentin Buira Date: Thu, 9 Jan 2025 13:36:53 +0100 Subject: [PATCH 2/5] migration to v4 again --- .github/workflows/packages.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/packages.yml b/.github/workflows/packages.yml index ea73369..0be5951 100644 --- a/.github/workflows/packages.yml +++ b/.github/workflows/packages.yml @@ -49,6 +49,7 @@ jobs: - uses: actions/upload-artifact@v4 with: + name: artifact-pygeodiff-linux path: ./pygeodiff-binaries/*.so build_windows_binaries: @@ -77,6 +78,7 @@ jobs: - uses: actions/upload-artifact@v4 with: + name: artifact-pygeodiff-windows path: ./pygeodiff-binaries/*.pyd build_macos_binary: @@ -111,6 +113,7 @@ jobs: - uses: actions/upload-artifact@v4 with: + name: artifact-pygeodiff-macos path: ./pygeodiff-binaries/*.dylib create_mergin_plugin_package: @@ -173,7 +176,9 @@ jobs: - name: Merge Artifacts uses: actions/upload-artifact/merge@v4 with: - pattern: ./pygeodiff-binaries/* + path: artifact-pygeodiff + pattern: artifact-pygeodiff-* + merge-multiple: true - uses: actions/upload-artifact@v4 with: name: Mergin From 581da131dd17cc80b8446f1ee5fe1c7f84d5965a Mon Sep 17 00:00:00 2001 From: Valentin Buira Date: Thu, 9 Jan 2025 13:41:10 +0100 Subject: [PATCH 3/5] 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 From 2ebb505fa013fb415023e251432794c3d73c5d3c Mon Sep 17 00:00:00 2001 From: Valentin Buira Date: Thu, 9 Jan 2025 13:58:36 +0100 Subject: [PATCH 4/5] migration to v4 --- .github/workflows/packages.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/packages.yml b/.github/workflows/packages.yml index 47a9727..df1d1fe 100644 --- a/.github/workflows/packages.yml +++ b/.github/workflows/packages.yml @@ -153,10 +153,11 @@ jobs: - name: Merge Artifacts uses: actions/upload-artifact/merge@v4 with: + name: artifact path: artifact-pygeodiff pattern: artifact-pygeodiff-* merge-multiple: true - + - uses: actions/download-artifact@v4 with: name: artifact From 7ffed8f02af4fa74c1d8fe51c3db50f3ec552d33 Mon Sep 17 00:00:00 2001 From: Valentin Buira Date: Thu, 9 Jan 2025 14:03:05 +0100 Subject: [PATCH 5/5] migration to v4 final --- .github/workflows/packages.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/packages.yml b/.github/workflows/packages.yml index df1d1fe..2bfd033 100644 --- a/.github/workflows/packages.yml +++ b/.github/workflows/packages.yml @@ -157,6 +157,7 @@ jobs: path: artifact-pygeodiff pattern: artifact-pygeodiff-* merge-multiple: true + delete-merged: true - uses: actions/download-artifact@v4 with: