diff --git a/.github/actions/build/action.yml b/.github/actions/build/action.yml index 59de40e0..4c12982b 100644 --- a/.github/actions/build/action.yml +++ b/.github/actions/build/action.yml @@ -7,4 +7,3 @@ runs: run: cmake --build . --config Release --verbose shell: bash working-directory: build - diff --git a/.github/actions/cmake/action.yml b/.github/actions/cmake/action.yml index ee47e1c4..9b1c1be8 100644 --- a/.github/actions/cmake/action.yml +++ b/.github/actions/cmake/action.yml @@ -11,9 +11,7 @@ runs: cmake -LA .. \ -DBUILD_DATA_TESTS=ON \ -DUSE_CPP_VERSION=${CPP_VERSION} \ - -DWITH_PROJ=${WITH_PROJ} \ -DPROTOZERO_INCLUDE_DIR=${GITHUB_WORKSPACE}/../protozero/include \ -DCMAKE_BUILD_TYPE=${BUILD_TYPE} shell: bash working-directory: build - diff --git a/.github/actions/ctest/action.yml b/.github/actions/ctest/action.yml index 2f0a8736..2c6da6cf 100644 --- a/.github/actions/ctest/action.yml +++ b/.github/actions/ctest/action.yml @@ -7,4 +7,3 @@ runs: run: ctest --output-on-failure -C Release shell: bash working-directory: build - diff --git a/.github/actions/install-macos/action.yml b/.github/actions/install-macos/action.yml index ae5965ec..fca8f14a 100644 --- a/.github/actions/install-macos/action.yml +++ b/.github/actions/install-macos/action.yml @@ -3,11 +3,9 @@ name: Install homebrew packages on macOS runs: using: composite steps: - - name: Install packages + - name: Install homebrew packages run: | brew install \ boost \ - gdal \ - google-sparsehash + gdal shell: bash - diff --git a/.github/actions/install-ubuntu/action.yml b/.github/actions/install-ubuntu/action.yml index 50134d29..2129f0b6 100644 --- a/.github/actions/install-ubuntu/action.yml +++ b/.github/actions/install-ubuntu/action.yml @@ -13,9 +13,6 @@ runs: libgdal-dev \ libgeos++-dev \ liblz4-dev \ - libproj-dev \ - libsparsehash-dev \ ruby-json \ spatialite-bin shell: bash - diff --git a/.github/workflows/clang-tidy.yml b/.github/workflows/clang-tidy.yml index bc419c6b..9dd5fed9 100644 --- a/.github/workflows/clang-tidy.yml +++ b/.github/workflows/clang-tidy.yml @@ -40,7 +40,6 @@ jobs: libgdal-dev \ libgeos++-dev \ liblz4-dev \ - libsparsehash-dev \ make \ zlib1g-dev shell: bash