From 4b9c7c97703a8e768e902e0dd9e9ce1a1dd40e73 Mon Sep 17 00:00:00 2001 From: Jochen Topf Date: Wed, 18 Dec 2024 11:45:33 +0100 Subject: [PATCH] Github action: More cleanups --- .github/actions/cmake-windows/action.yml | 1 - .github/actions/install-protozero/action.yml | 1 - .github/actions/install-windows/action.yml | 2 -- .github/workflows/ci.yml | 6 ------ 4 files changed, 10 deletions(-) diff --git a/.github/actions/cmake-windows/action.yml b/.github/actions/cmake-windows/action.yml index 2eafcb79..bb5f16d9 100644 --- a/.github/actions/cmake-windows/action.yml +++ b/.github/actions/cmake-windows/action.yml @@ -16,4 +16,3 @@ runs: -DPROTOZERO_INCLUDE_DIR=${GITHUB_WORKSPACE}/../protozero/include shell: bash working-directory: build - diff --git a/.github/actions/install-protozero/action.yml b/.github/actions/install-protozero/action.yml index 7526c0e6..491c3e9f 100644 --- a/.github/actions/install-protozero/action.yml +++ b/.github/actions/install-protozero/action.yml @@ -6,4 +6,3 @@ runs: - name: Install from git run: git clone --quiet --depth 1 https://github.com/mapbox/protozero.git ../protozero shell: bash - diff --git a/.github/actions/install-windows/action.yml b/.github/actions/install-windows/action.yml index ffe3a3c6..eae5830a 100644 --- a/.github/actions/install-windows/action.yml +++ b/.github/actions/install-windows/action.yml @@ -11,7 +11,5 @@ runs: bzip2:x64-windows \ expat:x64-windows \ lz4:x64-windows \ - sparsehash:x64-windows \ zlib:x64-windows shell: bash - diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4398a84c..548ed3ca 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -130,16 +130,11 @@ jobs: libgdal-dev \ libgeos++-dev \ liblz4-dev \ - libsparsehash-dev \ make \ ruby \ ruby-json \ spatialite-bin \ zlib1g-dev - - name: Install compiler - shell: bash - if: matrix.cpp_compiler == 'clang++-14' - run: apt-get install -yq clang-14 - name: Prepare container (dnf) shell: bash if: startsWith(matrix.image, 'fedora:') @@ -160,7 +155,6 @@ jobs: make \ ruby \ rubygem-json \ - sparsehash-devel \ spatialite-tools \ zlib-devel - uses: actions/checkout@v4