From 39264ba7b63076ced9f827a86eae8063711b244a Mon Sep 17 00:00:00 2001 From: snowman2 Date: Tue, 6 Sep 2022 22:59:20 -0500 Subject: [PATCH] fix --- .github/workflows/release.yaml | 4 +--- ci/vcpkg.json | 11 ----------- 2 files changed, 1 insertion(+), 14 deletions(-) delete mode 100644 ci/vcpkg.json diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 64d338b35..ad76e477f 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -101,10 +101,8 @@ jobs: cd "$VCPKG_INSTALLATION_ROOT" git pull > nul ./bootstrap-vcpkg.bat -disableMetrics - vcpkg install --feature-flags="versions,manifests" --x-manifest-root=${GITHUB_WORKSPACE}/ci --x-install-root=$VCPKG_INSTALLATION_ROOT/installed + vcpkg install proj mkdir -p ${GITHUB_WORKSPACE}/pyproj/proj_dir/share/proj - ls $VCPKG_INSTALLATION_ROOT/packages/proj_${{ matrix.triplet }}/share/proj - ls $VCPKG_INSTALLATION_ROOT/installed/${{ matrix.triplet }}/share/proj cp "$VCPKG_INSTALLATION_ROOT/installed/${{ matrix.triplet }}/share/proj/data/"* ${GITHUB_WORKSPACE}/pyproj/proj_dir/share/proj/ - name: Build wheels diff --git a/ci/vcpkg.json b/ci/vcpkg.json deleted file mode 100644 index 88aa3fb8e..000000000 --- a/ci/vcpkg.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "name": "pyproj", - "version": "3.4.0", - "dependencies": [ - { - "name": "proj", - "version>=": "9.1.0" - } - ], - "builtin-baseline": "c382312bed3da7be96bdab0f7426eaee1b3e0460" -}