fix 3rd-party directory

benbovy · Aug 19, 2024 · 47ac72f · 47ac72f
1 parent 338a850
commit 47ac72f
Showing 1 changed file with 6 additions and 17 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -69,7 +69,7 @@ jobs:
         id: cache-build
         uses: actions/cache@v4
         with:
-          path: ${{ runner.temp }}/3rd-party
+          path: ${{ github.workspace }}/3rd-party
           key: ${{ matrix.os }}-${{ matrix.arch }}-${{ env.ABSL_VERSION }}-${{ env.S2GEOMETRY_VERSION }}-${{ env.S2GEOGRAPHY_VERSION }}-${{ hashFiles('ci/*') }}
 
       - name: Fetch absl
@@ -78,7 +78,7 @@ jobs:
         with:
           repository: abseil/abseil-cpp
           ref: ${{ env.ABSL_VERSION }}
-          path: ${{ runner.temp }}/3rd-party/absl-src-${{ env.ABSL_VERSION }}
+          path: ${{ github.workspace }}/3rd-party/absl-src-${{ env.ABSL_VERSION }}
           fetch-depth: 0
 
       - name: Fetch s2geometry
@@ -87,7 +87,7 @@ jobs:
         with:
           repository: google/s2geometry
           ref: v${{ env.S2GEOMETRY_VERSION }}
-          path: ${{ runner.temp }}/3rd-party/s2geometry-src-${{ env.S2GEOMETRY_VERSION }}
+          path: ${{ github.workspace }}/3rd-party/s2geometry-src-${{ env.S2GEOMETRY_VERSION }}
           fetch-depth: 0
 
       - name: Fetch s2geography
@@ -96,7 +96,7 @@ jobs:
         with:
           repository: paleolimbot/s2geography
           ref: v${{ env.S2GEOGRAPHY_VERSION }}
-          path: ${{ runner.temp }}/3rd-party/s2geography-src-${{ env.S2GEOGRAPHY_VERSION }}
+          path: ${{ github.workspace }}/3rd-party/s2geography-src-${{ env.S2GEOGRAPHY_VERSION }}
           fetch-depth: 0
 
       - name: Build wheels
@@ -105,26 +105,15 @@ jobs:
           CIBW_ARCHS: ${{ matrix.arch }}
           CIBW_SKIP: cp36-* pp* *musllinux* *-manylinux_i686
           CIBW_TEST_SKIP: "cp38-macosx_arm64"
-          CIBW_ENVIRONMENT_LINUX:
-            DEPENDENCIES_DIR=${{ runner.temp }}/3rd-party
+          CIBW_ENVIRONMENT:
+            DEPENDENCIES_DIR=${{ github.workspace }}/3rd-party
             ABSL_VERSION=${{ env.ABSL_VERSION }}
             S2GEOMETRY_VERSION=${{ env.S2GEOMETRY_VERSION }}
             S2GEOGRAPHY_VERSION=${{ env.S2GEOGRAPHY_VERSION }}
             CXXSTANDARD=${{ env.CXXSTANDARD }}
           CIBW_ENVIRONMENT_MACOS:
-            DEPENDENCIES_DIR=${{ runner.temp }}/3rd-party
-            ABSL_VERSION=${{ env.ABSL_VERSION }}
-            S2GEOMETRY_VERSION=${{ env.S2GEOMETRY_VERSION }}
-            S2GEOGRAPHY_VERSION=${{ env.S2GEOGRAPHY_VERSION }}
-            CXXSTANDARD=${{ env.CXXSTANDARD }}
             MACOSX_DEPLOYMENT_TARGET=10.9
             CMAKE_OSX_ARCHITECTURES='${{ matrix.cmake_osx_architectures }}'
-          CIBW_ENVIRONMENT_WINDOWS:
-            DEPENDENCIES_DIR=${{ runner.temp }}/3rd-party
-            ABSL_VERSION=${{ env.ABSL_VERSION }}
-            S2GEOMETRY_VERSION=${{ env.S2GEOMETRY_VERSION }}
-            S2GEOGRAPHY_VERSION=${{ env.S2GEOGRAPHY_VERSION }}
-            CXXSTANDARD=${{ env.CXXSTANDARD }}
           CIBW_BEFORE_ALL: ./ci/install_3rdparty.sh
           CIBW_BEFORE_ALL_WINDOWS: ci\install_geos.cmd
           # CIBW_BEFORE_BUILD_WINDOWS: pip install delvewheel