From cf4094465b8c5de2ed7049d9e20e45fcae733531 Mon Sep 17 00:00:00 2001 From: Pieter Roggemans Date: Sat, 5 Jul 2025 07:36:50 +0200 Subject: [PATCH 01/27] BUILD: quick check if LibKML and LibSpatialite can be included now --- ci/vcpkg.json | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/ci/vcpkg.json b/ci/vcpkg.json index 34c6f997..9453d710 100644 --- a/ci/vcpkg.json +++ b/ci/vcpkg.json @@ -5,7 +5,15 @@ { "name": "gdal", "default-features": false, - "features": ["recommended-features", "curl", "geos", "iconv", "openssl"] + "features": [ + "recommended-features", + "curl", + "geos", + "iconv", + "openssl", + "libspatialite", + "libkml" + ] } ], "builtin-baseline": "66c1c9852bb30bd87285e77cc775072046d51fc6" From 209b07f01b7f3f34e402a66ffbab366794584ed6 Mon Sep 17 00:00:00 2001 From: Pieter Roggemans Date: Sat, 5 Jul 2025 08:04:33 +0200 Subject: [PATCH 02/27] Remove libpatialite --- ci/vcpkg.json | 1 - 1 file changed, 1 deletion(-) diff --git a/ci/vcpkg.json b/ci/vcpkg.json index 9453d710..18f4657d 100644 --- a/ci/vcpkg.json +++ b/ci/vcpkg.json @@ -11,7 +11,6 @@ "geos", "iconv", "openssl", - "libspatialite", "libkml" ] } From c0493dd7b5ee80c0ee5db51f7f4077f9ef0efb5b Mon Sep 17 00:00:00 2001 From: Pieter Roggemans Date: Sat, 5 Jul 2025 09:05:45 +0200 Subject: [PATCH 03/27] Reenable libspatialite + upload freexl logs --- .github/workflows/release.yml | 14 ++++++++++++++ ci/vcpkg.json | 3 ++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3a62dd42..1086d900 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -145,6 +145,20 @@ jobs: env: BUILDKIT_PROGRESS: plain + - name: Upload vcpkg freexl out logs to Github + uses: actions/upload-artifact@v3 + with: + name: vcpkg out logs + path: /opt/vcpkg/buildtrees/freexl/autoconf-x64-linux-dynamic-release-out.log + retention-days: 10 + + - name: Upload vcpkg freexl err logs to Github + uses: actions/upload-artifact@v3 + with: + name: vcpkg out logs + path: /opt/vcpkg/buildtrees/freexl/autoconf-x64-linux-dynamic-release-err.log + retention-days: 10 + - name: Build wheels uses: pypa/cibuildwheel@v2.23.3 diff --git a/ci/vcpkg.json b/ci/vcpkg.json index 18f4657d..18ec44b9 100644 --- a/ci/vcpkg.json +++ b/ci/vcpkg.json @@ -11,7 +11,8 @@ "geos", "iconv", "openssl", - "libkml" + "libkml", + "libspatialite" ] } ], From c5785efcec03fbad2aec6cd2a454d9040d26f375 Mon Sep 17 00:00:00 2001 From: Pieter Roggemans Date: Sat, 5 Jul 2025 09:11:14 +0200 Subject: [PATCH 04/27] Update release.yml --- .github/workflows/release.yml | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1086d900..6c019c94 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -145,18 +145,11 @@ jobs: env: BUILDKIT_PROGRESS: plain - - name: Upload vcpkg freexl out logs to Github - uses: actions/upload-artifact@v3 - with: - name: vcpkg out logs - path: /opt/vcpkg/buildtrees/freexl/autoconf-x64-linux-dynamic-release-out.log - retention-days: 10 - - - name: Upload vcpkg freexl err logs to Github - uses: actions/upload-artifact@v3 + - name: Upload vcpkg freexl build logs to Github + uses: actions/upload-artifact@v4 with: - name: vcpkg out logs - path: /opt/vcpkg/buildtrees/freexl/autoconf-x64-linux-dynamic-release-err.log + name: vcpkg freexl build logs + path: /opt/vcpkg/buildtrees/freexl/*.log retention-days: 10 - name: Build wheels From e8710d90a22a6fbf13b9dec578e58d0df67b210a Mon Sep 17 00:00:00 2001 From: Pieter Roggemans Date: Sat, 5 Jul 2025 09:26:26 +0200 Subject: [PATCH 05/27] Update release.yml --- .github/workflows/release.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6c019c94..29da93c5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -145,11 +145,12 @@ jobs: env: BUILDKIT_PROGRESS: plain - - name: Upload vcpkg freexl build logs to Github + - name: Upload vcpkg build logs + if: ${{ failure() }} uses: actions/upload-artifact@v4 with: - name: vcpkg freexl build logs - path: /opt/vcpkg/buildtrees/freexl/*.log + name: pyogrio-vcpkg-logs-${{ matrix.wheel_name }} + path: /opt/vcpkg/buildtrees/**/*.log" retention-days: 10 - name: Build wheels From fd45a4b01674dcf87c6600952fecd7bec8296ea8 Mon Sep 17 00:00:00 2001 From: Pieter Roggemans Date: Sat, 5 Jul 2025 15:47:18 +0200 Subject: [PATCH 06/27] Update release.yml --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 29da93c5..4e8b7e94 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -150,7 +150,7 @@ jobs: uses: actions/upload-artifact@v4 with: name: pyogrio-vcpkg-logs-${{ matrix.wheel_name }} - path: /opt/vcpkg/buildtrees/**/*.log" + path: /opt/vcpkg/buildtrees/**/*.log retention-days: 10 - name: Build wheels From b3b7cc86658f67e52658f1fbd59ff92deddab4c7 Mon Sep 17 00:00:00 2001 From: Pieter Roggemans Date: Sat, 5 Jul 2025 16:03:30 +0200 Subject: [PATCH 07/27] Update release.yml --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4e8b7e94..1435b8db 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -150,7 +150,7 @@ jobs: uses: actions/upload-artifact@v4 with: name: pyogrio-vcpkg-logs-${{ matrix.wheel_name }} - path: /opt/vcpkg/buildtrees/**/*.log + path: "/opt/vcpkg/buildtrees/**/*.log" retention-days: 10 - name: Build wheels From c737f165f5c0cca8ccd6de2b0b6637587b7709c6 Mon Sep 17 00:00:00 2001 From: Pieter Roggemans Date: Sat, 5 Jul 2025 16:12:04 +0200 Subject: [PATCH 08/27] Update release.yml --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1435b8db..11c43d38 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -150,7 +150,7 @@ jobs: uses: actions/upload-artifact@v4 with: name: pyogrio-vcpkg-logs-${{ matrix.wheel_name }} - path: "/opt/vcpkg/buildtrees/**/*.log" + path: "opt/vcpkg/buildtrees/**/*.log" retention-days: 10 - name: Build wheels From 5a8241e27404557b660df8d999b1b93cbb2aacff Mon Sep 17 00:00:00 2001 From: Pieter Roggemans Date: Sat, 5 Jul 2025 16:20:01 +0200 Subject: [PATCH 09/27] Update release.yml --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 11c43d38..b519492e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -150,7 +150,7 @@ jobs: uses: actions/upload-artifact@v4 with: name: pyogrio-vcpkg-logs-${{ matrix.wheel_name }} - path: "opt/vcpkg/buildtrees/**/*.log" + path: "/opt/vcpkg/buildtrees/freexl/*.log" retention-days: 10 - name: Build wheels From e4b40b549e1183f051f4b7322ff8b4b5e145d218 Mon Sep 17 00:00:00 2001 From: Pieter Roggemans Date: Sat, 5 Jul 2025 16:31:04 +0200 Subject: [PATCH 10/27] Update release.yml --- .github/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b519492e..38bff06c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -150,7 +150,7 @@ jobs: uses: actions/upload-artifact@v4 with: name: pyogrio-vcpkg-logs-${{ matrix.wheel_name }} - path: "/opt/vcpkg/buildtrees/freexl/*.log" + path: "opt/vcpkg/buildtrees/freexl/*.log" retention-days: 10 - name: Build wheels @@ -181,7 +181,7 @@ jobs: vcpkg_cache: "/Users/runner/.cache/vcpkg/archives" vcpkg_logs: "/usr/local/share/vcpkg/buildtrees/**/*.log" - - os: "windows-2019" + - os: "windows-latest" triplet: "x64-windows-dynamic-release" arch: AMD64 # windows requires windows-specific paths From 2810747df4e4f5e18e18a9b5539c3c79b3a9dffa Mon Sep 17 00:00:00 2001 From: Pieter Roggemans Date: Sat, 5 Jul 2025 17:16:08 +0200 Subject: [PATCH 11/27] Update release.yml --- .github/workflows/release.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 38bff06c..d66353e1 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -145,6 +145,19 @@ jobs: env: BUILDKIT_PROGRESS: plain + - name: Dump docker logs on failure + if: failure() + uses: jwalton/gh-docker-logs@v2 + with: + dest: './logs' + + - name: Upload logs to GitHub + if: failure() + uses: actions/upload-artifact@v4 + with: + name: Docker logs + path: ./logs/*.* + - name: Upload vcpkg build logs if: ${{ failure() }} uses: actions/upload-artifact@v4 From 51467c47a67907040ab12608044bcf47c605ed0d Mon Sep 17 00:00:00 2001 From: Pieter Roggemans Date: Sat, 5 Jul 2025 17:23:33 +0200 Subject: [PATCH 12/27] Update release.yml --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d66353e1..4f478f7b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -155,7 +155,7 @@ jobs: if: failure() uses: actions/upload-artifact@v4 with: - name: Docker logs + name: dumped-docker-logs path: ./logs/*.* - name: Upload vcpkg build logs From 5d0207c2df8d850f3a425e3c7926fd31cd1eeadb Mon Sep 17 00:00:00 2001 From: Pieter Roggemans Date: Sat, 5 Jul 2025 18:09:16 +0200 Subject: [PATCH 13/27] Update release.yml --- .github/workflows/release.yml | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4f478f7b..b9fba4a9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -145,25 +145,12 @@ jobs: env: BUILDKIT_PROGRESS: plain - - name: Dump docker logs on failure - if: failure() - uses: jwalton/gh-docker-logs@v2 - with: - dest: './logs' - - - name: Upload logs to GitHub - if: failure() - uses: actions/upload-artifact@v4 - with: - name: dumped-docker-logs - path: ./logs/*.* - - name: Upload vcpkg build logs if: ${{ failure() }} uses: actions/upload-artifact@v4 with: name: pyogrio-vcpkg-logs-${{ matrix.wheel_name }} - path: "opt/vcpkg/buildtrees/freexl/*.log" + path: "opt/vcpkg/**/*autoconf*.log" retention-days: 10 - name: Build wheels From eda2b855bb30aa962d9a7fc876c2bf9dd7b49078 Mon Sep 17 00:00:00 2001 From: Pieter Roggemans Date: Sat, 5 Jul 2025 18:09:27 +0200 Subject: [PATCH 14/27] Update release.yml --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b9fba4a9..1beb5420 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -150,7 +150,7 @@ jobs: uses: actions/upload-artifact@v4 with: name: pyogrio-vcpkg-logs-${{ matrix.wheel_name }} - path: "opt/vcpkg/**/*autoconf*.log" + path: "/opt/vcpkg/**/*autoconf*.log" retention-days: 10 - name: Build wheels From c089e1701859a8dd5bf36ef651bdeedc6355aa1c Mon Sep 17 00:00:00 2001 From: Pieter Roggemans Date: Sat, 5 Jul 2025 21:26:32 +0200 Subject: [PATCH 15/27] Try changing vcpkg work dir --- .github/workflows/release.yml | 5 ++++- ci/manylinux_2_28_x86_64-vcpkg-gdal.Dockerfile | 18 +++++++++--------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1beb5420..1af9eb03 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -106,17 +106,20 @@ jobs: container: "ci/manylinux2014_x86_64-vcpkg-gdal.Dockerfile" os: ubuntu-latest arch: x86_64 + vcpkg_logs: "/usr/local/share/vcpkg/buildtrees/**/*.log" # use manylinux_2_28 for any platforms with glibc>=2.28 - wheel_name: "pyogrio-wheel-linux-manylinux_2_28_x86_64" container: "ci/manylinux_2_28_x86_64-vcpkg-gdal.Dockerfile" os: ubuntu-latest arch: x86_64 + vcpkg_logs: "/usr/local/share/vcpkg/buildtrees/**/*.log" - wheel_name: "pyogrio-wheel-linux-manylinux_2_28_aarch64" container: "ci/manylinux_2_28_aarch64-vcpkg-gdal.Dockerfile" os: ubuntu-24.04-arm arch: aarch64 + vcpkg_logs: "/usr/local/share/vcpkg/buildtrees/**/*.log" steps: - name: Checkout @@ -150,7 +153,7 @@ jobs: uses: actions/upload-artifact@v4 with: name: pyogrio-vcpkg-logs-${{ matrix.wheel_name }} - path: "/opt/vcpkg/**/*autoconf*.log" + path: ${{ matrix.vcpkg_logs }} retention-days: 10 - name: Build wheels diff --git a/ci/manylinux_2_28_x86_64-vcpkg-gdal.Dockerfile b/ci/manylinux_2_28_x86_64-vcpkg-gdal.Dockerfile index 9966903c..29e8d278 100644 --- a/ci/manylinux_2_28_x86_64-vcpkg-gdal.Dockerfile +++ b/ci/manylinux_2_28_x86_64-vcpkg-gdal.Dockerfile @@ -3,11 +3,11 @@ FROM quay.io/pypa/manylinux_2_28_x86_64:2025-01-11-3165879 # building openssl needs IPC-Cmd (https://github.com/microsoft/vcpkg/issues/24988) RUN dnf -y install curl zip unzip tar ninja-build perl-IPC-Cmd -RUN git clone https://github.com/Microsoft/vcpkg.git /opt/vcpkg && \ - git -C /opt/vcpkg checkout 66c1c9852bb30bd87285e77cc775072046d51fc6 +RUN git clone https://github.com/Microsoft/vcpkg.git /usr/local/share/vcpkg && \ + git -C /usr/local/share/vcpkg checkout 66c1c9852bb30bd87285e77cc775072046d51fc6 -ENV VCPKG_INSTALLATION_ROOT="/opt/vcpkg" -ENV PATH="${PATH}:/opt/vcpkg" +ENV VCPKG_INSTALLATION_ROOT="/usr/local/share/vcpkg" +ENV PATH="${PATH}:/usr/local/share/vcpkg" ENV VCPKG_DEFAULT_TRIPLET="x64-linux-dynamic-release" @@ -18,14 +18,14 @@ RUN bootstrap-vcpkg.sh && \ vcpkg integrate install && \ vcpkg integrate bash -COPY ci/custom-triplets/x64-linux-dynamic-release.cmake opt/vcpkg/custom-triplets/x64-linux-dynamic-release.cmake -COPY ci/vcpkg.json opt/vcpkg/ +COPY ci/custom-triplets/x64-linux-dynamic-release.cmake /usr/local/share/vcpkg/custom-triplets/x64-linux-dynamic-release.cmake +COPY ci/vcpkg.json /usr/local/share/vcpkg/ ENV LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:/opt/vcpkg/installed/x64-linux-dynamic-release/lib" -RUN vcpkg install --overlay-triplets=opt/vcpkg/custom-triplets \ +RUN vcpkg install --overlay-triplets=/usr/local/share/vcpkg/custom-triplets \ --feature-flags="versions,manifests" \ - --x-manifest-root=opt/vcpkg \ - --x-install-root=opt/vcpkg/installed && \ + --x-manifest-root=/usr/local/share/vcpkg \ + --x-install-root=/usr/local/share/vcpkg/installed && \ vcpkg list # setting git safe directory is required for properly building wheels when From 6256bc3955935724dba605d3e1d25fff0c4b798e Mon Sep 17 00:00:00 2001 From: Pieter Roggemans Date: Sat, 5 Jul 2025 21:52:33 +0200 Subject: [PATCH 16/27] Try to exclude freexl from the libspatialite dependencies --- ci/vcpkg.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ci/vcpkg.json b/ci/vcpkg.json index 18ec44b9..e5865c70 100644 --- a/ci/vcpkg.json +++ b/ci/vcpkg.json @@ -12,7 +12,10 @@ "iconv", "openssl", "libkml", - "libspatialite" + { + "name": "libspatialite", + "default-features": false + } ] } ], From f7ba77fb418bcd298c4ec1097198cede0327d9a1 Mon Sep 17 00:00:00 2001 From: Pieter Roggemans Date: Sat, 5 Jul 2025 22:16:04 +0200 Subject: [PATCH 17/27] Update vcpkg.json --- ci/vcpkg.json | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/ci/vcpkg.json b/ci/vcpkg.json index e5865c70..a8f89a8e 100644 --- a/ci/vcpkg.json +++ b/ci/vcpkg.json @@ -12,11 +12,12 @@ "iconv", "openssl", "libkml", - { - "name": "libspatialite", - "default-features": false - } + "libspatialite" ] + }, + { + "name": "libspatialite", + "default-features": false } ], "builtin-baseline": "66c1c9852bb30bd87285e77cc775072046d51fc6" From 0e8f7cb647c8c8a1a021dc130e18375020c2ba86 Mon Sep 17 00:00:00 2001 From: Pieter Roggemans Date: Sat, 5 Jul 2025 22:22:26 +0200 Subject: [PATCH 18/27] Update vcpkg.json --- ci/vcpkg.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ci/vcpkg.json b/ci/vcpkg.json index a8f89a8e..b3be4cf6 100644 --- a/ci/vcpkg.json +++ b/ci/vcpkg.json @@ -11,8 +11,7 @@ "geos", "iconv", "openssl", - "libkml", - "libspatialite" + "libkml" ] }, { From b178acd3b71429661da35d08d4e891ed92498f92 Mon Sep 17 00:00:00 2001 From: Pieter Roggemans Date: Sat, 5 Jul 2025 22:50:11 +0200 Subject: [PATCH 19/27] Update vcpkg.json --- ci/vcpkg.json | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/ci/vcpkg.json b/ci/vcpkg.json index b3be4cf6..67a5fc2a 100644 --- a/ci/vcpkg.json +++ b/ci/vcpkg.json @@ -2,6 +2,10 @@ "name": "pyogrio", "version": "0.11.0", "dependencies": [ + { + "name": "libspatialite", + "default-features": false + }, { "name": "gdal", "default-features": false, @@ -11,12 +15,9 @@ "geos", "iconv", "openssl", - "libkml" + "libkml", + "libspatialite" ] - }, - { - "name": "libspatialite", - "default-features": false } ], "builtin-baseline": "66c1c9852bb30bd87285e77cc775072046d51fc6" From a606a62dad5519993e7e073d242ae110a5bb9ebc Mon Sep 17 00:00:00 2001 From: Pieter Roggemans Date: Sat, 5 Jul 2025 22:58:04 +0200 Subject: [PATCH 20/27] Update vcpkg.json --- ci/vcpkg.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ci/vcpkg.json b/ci/vcpkg.json index 67a5fc2a..630890ff 100644 --- a/ci/vcpkg.json +++ b/ci/vcpkg.json @@ -15,8 +15,7 @@ "geos", "iconv", "openssl", - "libkml", - "libspatialite" + "libkml" ] } ], From 28537ddad609e72a04746b24e4b4cb67a7757c00 Mon Sep 17 00:00:00 2001 From: Pieter Roggemans Date: Sun, 6 Jul 2025 02:55:38 +0200 Subject: [PATCH 21/27] Add rttopo feature to spatialite --- ci/vcpkg.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ci/vcpkg.json b/ci/vcpkg.json index 630890ff..4b0a9702 100644 --- a/ci/vcpkg.json +++ b/ci/vcpkg.json @@ -4,7 +4,10 @@ "dependencies": [ { "name": "libspatialite", - "default-features": false + "default-features": false, + "features": [ + "rttopo" + ] }, { "name": "gdal", From 39e962d127e33c4107f473879f199d93246a4c11 Mon Sep 17 00:00:00 2001 From: Pieter Roggemans Date: Sun, 6 Jul 2025 21:03:34 +0200 Subject: [PATCH 22/27] Move the vcpkg also to usr for the other containers --- ci/manylinux2014_x86_64-vcpkg-gdal.Dockerfile | 24 +++++++++---------- ...nylinux_2_28_aarch64-vcpkg-gdal.Dockerfile | 20 ++++++++-------- ...anylinux_2_28_x86_64-vcpkg-gdal.Dockerfile | 2 +- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/ci/manylinux2014_x86_64-vcpkg-gdal.Dockerfile b/ci/manylinux2014_x86_64-vcpkg-gdal.Dockerfile index 0df57ceb..d993a59f 100644 --- a/ci/manylinux2014_x86_64-vcpkg-gdal.Dockerfile +++ b/ci/manylinux2014_x86_64-vcpkg-gdal.Dockerfile @@ -6,11 +6,11 @@ RUN yum install -y curl unzip zip tar perl-IPC-Cmd # require python >= 3.7 (python 3.6 is default on base image) for meson RUN ln -s /opt/python/cp38-cp38/bin/python3 /usr/bin/python3 -RUN git clone https://github.com/Microsoft/vcpkg.git /opt/vcpkg && \ - git -C /opt/vcpkg checkout 66c1c9852bb30bd87285e77cc775072046d51fc6 +RUN git clone https://github.com/Microsoft/vcpkg.git /usr/local/share/vcpkg && \ + git -C /usr/local/share/vcpkg checkout 66c1c9852bb30bd87285e77cc775072046d51fc6 -ENV VCPKG_INSTALLATION_ROOT="/opt/vcpkg" -ENV PATH="${PATH}:/opt/vcpkg" +ENV VCPKG_INSTALLATION_ROOT="/usr/local/share/vcpkg" +ENV PATH="${PATH}:/usr/local/share/vcpkg" ENV VCPKG_DEFAULT_TRIPLET="x64-linux-dynamic-release" @@ -21,16 +21,16 @@ RUN bootstrap-vcpkg.sh && \ vcpkg integrate install && \ vcpkg integrate bash -COPY ci/custom-triplets/x64-linux-dynamic-release.cmake opt/vcpkg/custom-triplets/x64-linux-dynamic-release.cmake -COPY ci/vcpkg-custom-ports/ opt/vcpkg/custom-ports/ -COPY ci/vcpkg.json opt/vcpkg/ +COPY ci/custom-triplets/x64-linux-dynamic-release.cmake /usr/local/share/vcpkg/custom-triplets/x64-linux-dynamic-release.cmake +COPY ci/vcpkg-custom-ports/ /usr/local/share/vcpkg/custom-ports/ +COPY ci/vcpkg.json /usr/local/share/vcpkg/ -ENV LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:/opt/vcpkg/installed/x64-linux-dynamic-release/lib" -RUN vcpkg install --overlay-triplets=opt/vcpkg/custom-triplets \ - --overlay-ports=opt/vcpkg/custom-ports \ +ENV LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:/usr/local/share/vcpkg/installed/x64-linux-dynamic-release/lib" +RUN vcpkg install --overlay-triplets=/usr/local/share/vcpkg/custom-triplets \ + --overlay-ports=/usr/local/share/vcpkg/custom-ports \ --feature-flags="versions,manifests" \ - --x-manifest-root=opt/vcpkg \ - --x-install-root=opt/vcpkg/installed && \ + --x-manifest-root=/usr/local/share/vcpkg \ + --x-install-root=/usr/local/share/vcpkg/installed && \ vcpkg list # setting git safe directory is required for properly building wheels when diff --git a/ci/manylinux_2_28_aarch64-vcpkg-gdal.Dockerfile b/ci/manylinux_2_28_aarch64-vcpkg-gdal.Dockerfile index 28a65011..616fd0ca 100644 --- a/ci/manylinux_2_28_aarch64-vcpkg-gdal.Dockerfile +++ b/ci/manylinux_2_28_aarch64-vcpkg-gdal.Dockerfile @@ -3,11 +3,11 @@ FROM quay.io/pypa/manylinux_2_28_aarch64:2025-01-11-3165879 # building openssl needs IPC-Cmd (https://github.com/microsoft/vcpkg/issues/24988) RUN dnf -y install curl zip unzip tar ninja-build perl-IPC-Cmd -RUN git clone https://github.com/Microsoft/vcpkg.git /opt/vcpkg && \ - git -C /opt/vcpkg checkout 66c1c9852bb30bd87285e77cc775072046d51fc6 +RUN git clone https://github.com/Microsoft/vcpkg.git /usr/local/share/vcpkg && \ + git -C /usr/local/share/vcpkg checkout 66c1c9852bb30bd87285e77cc775072046d51fc6 -ENV VCPKG_INSTALLATION_ROOT="/opt/vcpkg" -ENV PATH="${PATH}:/opt/vcpkg" +ENV VCPKG_INSTALLATION_ROOT="/usr/local/share/vcpkg" +ENV PATH="${PATH}:/usr/local/share/vcpkg" ENV VCPKG_DEFAULT_TRIPLET="arm64-linux-dynamic-release" # pkgconf fails to build with default debug mode of arm64-linux host @@ -23,14 +23,14 @@ RUN bootstrap-vcpkg.sh && \ vcpkg integrate install && \ vcpkg integrate bash -COPY ci/custom-triplets/arm64-linux-dynamic-release.cmake opt/vcpkg/custom-triplets/arm64-linux-dynamic-release.cmake -COPY ci/vcpkg.json opt/vcpkg/ +COPY ci/custom-triplets/arm64-linux-dynamic-release.cmake /usr/local/share/vcpkg/custom-triplets/arm64-linux-dynamic-release.cmake +COPY ci/vcpkg.json /usr/local/share/vcpkg/ -ENV LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:/opt/vcpkg/installed/arm64-linux-dynamic-release/lib" -RUN vcpkg install --overlay-triplets=opt/vcpkg/custom-triplets \ +ENV LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:/usr/local/share/vcpkg/installed/arm64-linux-dynamic-release/lib" +RUN vcpkg install --overlay-triplets=/usr/local/share/vcpkg/custom-triplets \ --feature-flags="versions,manifests" \ - --x-manifest-root=opt/vcpkg \ - --x-install-root=opt/vcpkg/installed && \ + --x-manifest-root=/usr/local/share/vcpkg/ \ + --x-install-root=/usr/local/share/vcpkg/installed && \ vcpkg list # setting git safe directory is required for properly building wheels when diff --git a/ci/manylinux_2_28_x86_64-vcpkg-gdal.Dockerfile b/ci/manylinux_2_28_x86_64-vcpkg-gdal.Dockerfile index 29e8d278..c37e2188 100644 --- a/ci/manylinux_2_28_x86_64-vcpkg-gdal.Dockerfile +++ b/ci/manylinux_2_28_x86_64-vcpkg-gdal.Dockerfile @@ -21,7 +21,7 @@ RUN bootstrap-vcpkg.sh && \ COPY ci/custom-triplets/x64-linux-dynamic-release.cmake /usr/local/share/vcpkg/custom-triplets/x64-linux-dynamic-release.cmake COPY ci/vcpkg.json /usr/local/share/vcpkg/ -ENV LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:/opt/vcpkg/installed/x64-linux-dynamic-release/lib" +ENV LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:/usr/local/share/vcpkg/installed/x64-linux-dynamic-release/lib" RUN vcpkg install --overlay-triplets=/usr/local/share/vcpkg/custom-triplets \ --feature-flags="versions,manifests" \ --x-manifest-root=/usr/local/share/vcpkg \ From ef76dd63b2964916c3937b97016a54e0358017e6 Mon Sep 17 00:00:00 2001 From: Pieter Roggemans Date: Sun, 6 Jul 2025 22:35:58 +0200 Subject: [PATCH 23/27] Try to docker copy log files first --- .github/workflows/release.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1af9eb03..c2492075 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -148,12 +148,17 @@ jobs: env: BUILDKIT_PROGRESS: plain + - name: Copy log files from Docker container + if: ${{ failure() }} + run: | + docker cp manylinux-${{ matrix.arch }}-vcpkg-gdal:latest:/usr/local/share/vcpkg/buildtrees/libspatialite/*.log" ~ + - name: Upload vcpkg build logs if: ${{ failure() }} uses: actions/upload-artifact@v4 with: name: pyogrio-vcpkg-logs-${{ matrix.wheel_name }} - path: ${{ matrix.vcpkg_logs }} + path: ~/*.log retention-days: 10 - name: Build wheels From 6503bec8b4c193b1d67eb6ac11fdecb9fff6eda6 Mon Sep 17 00:00:00 2001 From: Pieter Roggemans Date: Sun, 6 Jul 2025 22:57:43 +0200 Subject: [PATCH 24/27] Update release.yml --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c2492075..bd9d340a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -151,7 +151,7 @@ jobs: - name: Copy log files from Docker container if: ${{ failure() }} run: | - docker cp manylinux-${{ matrix.arch }}-vcpkg-gdal:latest:/usr/local/share/vcpkg/buildtrees/libspatialite/*.log" ~ + docker cp manylinux-${{ matrix.arch }}-vcpkg-gdal:latest:/usr/local/share/vcpkg/buildtrees/libspatialite/*.log ~/ - name: Upload vcpkg build logs if: ${{ failure() }} From 521d4b6720ecf6159f1b521da9d79ed970436564 Mon Sep 17 00:00:00 2001 From: Pieter Roggemans Date: Mon, 7 Jul 2025 05:27:40 +0200 Subject: [PATCH 25/27] Update release.yml --- .github/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index bd9d340a..efe7fbae 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -140,7 +140,7 @@ jobs: with: context: . file: ${{ matrix.container }} - tags: manylinux-${{ matrix.arch }}-vcpkg-gdal:latest + tags: manylinux-${{ matrix.arch }}-vcpkg-gdal-latest push: false load: true cache-from: type=gha @@ -151,7 +151,7 @@ jobs: - name: Copy log files from Docker container if: ${{ failure() }} run: | - docker cp manylinux-${{ matrix.arch }}-vcpkg-gdal:latest:/usr/local/share/vcpkg/buildtrees/libspatialite/*.log ~/ + docker cp manylinux-${{ matrix.arch }}-vcpkg-gdal-latest:/usr/local/share/vcpkg/buildtrees/libspatialite/*.log ~/ - name: Upload vcpkg build logs if: ${{ failure() }} From 0c6d151568a64faaa5d1ff1a123fd1cbbecf3da3 Mon Sep 17 00:00:00 2001 From: Pieter Roggemans Date: Wed, 16 Jul 2025 22:46:04 +0200 Subject: [PATCH 26/27] Update release.yml --- .github/workflows/release.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index efe7fbae..f33acba5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -148,10 +148,14 @@ jobs: env: BUILDKIT_PROGRESS: plain - - name: Copy log files from Docker container + - name: Upload artifacts if: ${{ failure() }} - run: | - docker cp manylinux-${{ matrix.arch }}-vcpkg-gdal-latest:/usr/local/share/vcpkg/buildtrees/libspatialite/*.log ~/ + uses: actions/upload-artifact@v4 + with: + pattern: !*.dockerbuild + + - name: Display structure of downloaded files + run: ls -R - name: Upload vcpkg build logs if: ${{ failure() }} From e6be838b419e89b48241a79709442d6d98288e9f Mon Sep 17 00:00:00 2001 From: Pieter Roggemans Date: Wed, 16 Jul 2025 22:50:52 +0200 Subject: [PATCH 27/27] Update release.yml --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f33acba5..042daeb4 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -152,7 +152,7 @@ jobs: if: ${{ failure() }} uses: actions/upload-artifact@v4 with: - pattern: !*.dockerbuild + pattern: "!*.dockerbuild" - name: Display structure of downloaded files run: ls -R