diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 61d5b7a8c..a094eb3d3 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -278,7 +278,3 @@ jobs: path: nuget/*.nupkg overwrite: true - - name: Push packages - if: ${{ github.event.pull_request.merged == true || github.ref == 'refs/heads/main' || fromJson(inputs.is-version-branch) }} - run: | - make -f ../unix/push-packages-makefile BUILD_NUMBER_TAIL=${{ github.run_number }} API_KEY_GITHUB=${{ secrets.API_KEY_GITHUB }} API_KEY_NUGET=${{ secrets.API_KEY_NUGET }} diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 33961bc04..ea5457c79 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -152,6 +152,31 @@ jobs: path: nuget merge-multiple: true + # Per-platform bundle packages (MaxRev.Gdal.LinuxRuntime.Minimal, + # MaxRev.Gdal.MacosRuntime.Minimal) are built by PushPackages-Linux + # and PushPackages-Macos in the reusable workflows. Download them so + # the centralised push below publishes the complete package set. + - uses: actions/download-artifact@v6.0.0 + with: + name: packages-unix-final + path: nuget + merge-multiple: true + + - uses: actions/download-artifact@v6.0.0 + with: + name: packages-osx-final + path: nuget + merge-multiple: true + + # Re-download the canonical Linux-built Core last so it overwrites the + # copy that osx/publish-makefile (and win/) also pack under the same + # filename into their bundle artifacts. + - uses: actions/download-artifact@v6.0.0 + with: + name: packages-core + path: nuget + merge-multiple: true + - name: Remove old formats run: | rm -rf ${{ github.workspace }}/tests/gdal-formats diff --git a/.github/workflows/unix.yml b/.github/workflows/unix.yml index da68bf2d3..76c7984d8 100644 --- a/.github/workflows/unix.yml +++ b/.github/workflows/unix.yml @@ -305,8 +305,3 @@ jobs: path: nuget/*.nupkg overwrite: true - - name: Push packages - if: ${{ github.event.pull_request.merged == true || github.ref == 'refs/heads/main' || fromJson(inputs.is-version-branch) }} - run: | - make -f push-packages-makefile PRERELEASE=${{ inputs.is-pre-release }} INCLUDE_CORE=1 \ - BUILD_NUMBER_TAIL=${{ github.run_number }} API_KEY_GITHUB=${{ secrets.API_KEY_GITHUB }} API_KEY_NUGET=${{ secrets.API_KEY_NUGET }} diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 6dd4c9437..ba6e12ec8 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -224,7 +224,3 @@ jobs: api-user-nuget: ${{ secrets.API_USER_NUGET }} shell: pwsh - - name: Push packages - if: ${{ github.event.pull_request.merged == true || github.ref == 'refs/heads/main' || fromJson(inputs.is-version-branch) }} - run: | - make -f push-packages-makefile BUILD_NUMBER_TAIL=${{ github.run_number }} API_KEY_GITHUB=${{ secrets.API_KEY_GITHUB }} API_KEY_NUGET=${{ secrets.API_KEY_NUGET }}