diff --git a/.github/workflows/packages.yml b/.github/workflows/packages.yml index b291c6c..2bfd033 100644 --- a/.github/workflows/packages.yml +++ b/.github/workflows/packages.yml @@ -47,8 +47,9 @@ 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: + name: artifact-pygeodiff-linux path: ./pygeodiff-binaries/*.so build_windows_binaries: @@ -75,8 +76,9 @@ 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: + name: artifact-pygeodiff-windows path: ./pygeodiff-binaries/*.pyd build_macos_binary: @@ -109,8 +111,9 @@ jobs: exit 1 fi - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: + name: artifact-pygeodiff-macos path: ./pygeodiff-binaries/*.dylib create_mergin_plugin_package: @@ -147,8 +150,16 @@ 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: + name: artifact + path: artifact-pygeodiff + pattern: artifact-pygeodiff-* + merge-multiple: true + delete-merged: true - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: name: artifact path: pygeodiff-binaries @@ -169,7 +180,9 @@ jobs: cp qgis-mergin-plugin/LICENSE.txt output/Mergin/LICENSE (cd output && zip -r9 ../mergin.zip Mergin/) - - uses: actions/upload-artifact@v3 + + + - uses: actions/upload-artifact@v4 with: name: Mergin path: output/