[pull] master from valhalla:master

.circleci/config.yml

@@ -1,19 +1,6 @@
 version: 2.1
 
-executors:
-  macos:
-    macos:
-      xcode: 13.4.1
-    environment:
-      HOMEBREW_NO_AUTO_UPDATE: 1
-      CXXFLAGS: -DGEOS_INLINE
-
 commands:
-  mac_deps:
-    steps:
-      - run: brew install protobuf cmake ccache libtool libspatialite pkg-config luajit curl wget czmq lz4 spatialite-tools unzip
-      - run: sudo python3 -m pip install requests shapely "conan<2.0.0"
-      - run: git clone https://github.com/kevinkreiser/prime_server --recurse-submodules && cd prime_server && ./autogen.sh && ./configure && make -j8 && make install
   linux_deps:
     steps:
       - run: ./scripts/install-linux-deps.sh
@@ -29,7 +16,7 @@ commands:
 jobs:
   lint-build-debug:
     docker:
-      - image: ubuntu:23.04
+      - image: ubuntu:24.04
     resource_class: xlarge
     steps:
       - checkout
@@ -39,28 +26,26 @@ jobs:
       - run: git submodule sync && git submodule update --init
       - restore_cache:
           keys:
-            - ccache-debug-linux-x86_64-v3-{{ .Branch }}-{{ checksum "conanfile.txt" }}
-            - ccache-debug-linux-x86_64-v3-{{ checksum "conanfile.txt" }}
+            - ccache-debug-linux-x86_64-v3-{{ .Branch }}
+            - ccache-debug-linux-x86_64-v3-master
+            - ccache-debug-linux-x86_64-v3-
       - run: |
           mkdir build
           # NOTE: -Werror disabled in CI, as we currently have >4k warnings.
           cd build
           cmake .. -DCMAKE_BUILD_TYPE=Debug -DENABLE_COVERAGE=On -DCPACK_GENERATOR=DEB \
             -DENABLE_COMPILER_WARNINGS=On -DENABLE_WERROR=Off -DCMAKE_EXPORT_COMPILE_COMMANDS=On \
-            -DCMAKE_CXX_FLAGS="-fuse-ld=lld" -DLOGGING_LEVEL=INFO -DENABLE_PYTHON_BINDINGS=On
+            -DCMAKE_CXX_FLAGS="-fuse-ld=lld" -DLOGGING_LEVEL=INFO -DENABLE_PYTHON_BINDINGS=On -DENABLE_GDAL=On
       - run: python3 ./scripts/valhalla_build_config
       - run: make -C build -j8
       - run: make -C build utrecht_tiles
       - run: make -C build -j8 tests
-      - run: make -C build -j8 benchmarks
-      - run: make -C build -j8 run-benchmarks
       # Note: we save the cache here before doing linting so that if linting fails, we can rebuild quickly
       # for follow-up fixes
       - save_cache:
-          key: ccache-debug-linux-x86_64-v3-{{ .Branch }}-{{ checksum "conanfile.txt" }}-{{ epoch }}
+          key: ccache-debug-linux-x86_64-v3-{{ .Branch }}-{{ epoch }}
           paths:
-            - ~/.ccache
-            - ~/.conan
+            - ~/.cache/ccache
       - run: scripts/clang-tidy-only-diff.sh 4
       - run: sudo make -C build install
       - run: make -C build package
@@ -71,7 +56,7 @@ jobs:
 
   build-release:
     docker:
-      - image: ubuntu:23.04
+      - image: ubuntu:24.04
     resource_class: xlarge
     steps:
       - checkout
@@ -81,32 +66,30 @@ jobs:
       - run: git submodule sync && git submodule update --init
       - restore_cache:
           keys:
-            - ccache-release-linux-x86_64-v3-{{ .Branch }}-{{ checksum "conanfile.txt" }}
-            - ccache-release-linux-x86_64-v3-{{ checksum "conanfile.txt" }}
+            - ccache-release-linux-x86_64-v3-{{ .Branch }}
+            - ccache-release-linux-x86_64-v3-master
+            - ccache-release-linux-x86_64-v3
       - run: |
           mkdir build
           cd build
           cmake .. -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=On -DENABLE_PYTHON_BINDINGS=On -DLOGGING_LEVEL=TRACE \
             -DCPACK_GENERATOR=DEB -DCPACK_PACKAGE_VERSION_SUFFIX="-0ubuntu1-$(lsb_release -sc)" -DENABLE_SANITIZERS=ON \
-            -DBENCHMARK_ENABLE_WERROR=Off -DENABLE_SINGLE_FILES_WERROR=Off
+            -DENABLE_SINGLE_FILES_WERROR=Off -DENABLE_GDAL=On
       - run: make -C build -j8
       - run: make -C build utrecht_tiles
       - run: make -C build -j8 tests
       # leaks in glibc we cant control for
       - run: export ASAN_OPTIONS=detect_leaks=0 && make -C build -j8 check
-      - run: make -C build -j8 benchmarks
-      - run: make -C build -j8 run-benchmarks
       - save_cache:
-          key: ccache-release-linux-x86_64-v3-{{ .Branch }}-{{ checksum "conanfile.txt" }}-{{ epoch }}
+          key: ccache-release-linux-x86_64-v3-{{ .Branch }}-{{ epoch }}
           paths:
-            - ~/.ccache
-            - ~/.conan
+            - ~/.cache/ccache
       - run: sudo make -C build install
       - run: make -C build package
 
   build-arm-release:
     docker:
-      - image: arm64v8/ubuntu:23.04
+      - image: arm64v8/ubuntu:24.04
     resource_class: arm.xlarge
     steps:
       - checkout
@@ -116,56 +99,26 @@ jobs:
       - run: git submodule sync && git submodule update --init
       - restore_cache:
           keys:
-            - ccache-release-linux-arm_64-v3-{{ .Branch }}-{{ checksum "conanfile.txt" }}
-            - ccache-release-linux-arm_64-v3-{{ checksum "conanfile.txt" }}
+            - ccache-release-linux-arm_64-v3-{{ .Branch }}
+            - ccache-release-linux-arm_64-v3-master
+            - ccache-release-linux-arm_64-v3
       - run: |
           mkdir build
           cd build
           cmake .. -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=On -DENABLE_PYTHON_BINDINGS=On -DCPACK_GENERATOR=DEB \
-            -DCPACK_PACKAGE_VERSION_SUFFIX="-0ubuntu1-$(lsb_release -sc)" -DBENCHMARK_ENABLE_WERROR=Off -DENABLE_SINGLE_FILES_WERROR=Off
+            -DCPACK_PACKAGE_VERSION_SUFFIX="-0ubuntu1-$(lsb_release -sc)" -DENABLE_SINGLE_FILES_WERROR=Off -DENABLE_GDAL=On
       - run: make -C build -j8
       - run: make -C build utrecht_tiles
       - run: make -C build -j8 tests
       # leaks in glibc we cant control for
       - run: export ASAN_OPTIONS=detect_leaks=0 && make -C build -j8 check
-      - run: make -C build -j8 benchmarks
-      - run: make -C build -j8 run-benchmarks
       - save_cache:
-          key: ccache-release-linux-arm_64-v3-{{ .Branch }}-{{ checksum "conanfile.txt" }}-{{ epoch }}
+          key: ccache-release-linux-arm_64-v3-{{ .Branch }}
           paths:
-            - ~/.ccache
-            - ~/.conan
+            - ~/.cache/ccache
       - run: sudo make -C build install
       - run: make -C build package
 
-  build-osx:
-    executor: macos
-    resource_class: macos.x86.medium.gen2
-    steps:
-      - checkout
-      - check_ci_lint
-      - mac_deps
-      - run: git submodule sync && git submodule update --init
-      - restore_cache:
-          keys:
-            - ccache-release-macos-{{ .Branch }}-{{ checksum "conanfile.txt" }}
-            - ccache-release-macos-{{ checksum "conanfile.txt" }}
-      - run: |
-          mkdir -p build
-          cd build
-          cmake ..
-      - run: make -C build -j8
-      - run: make -C build utrecht_tiles
-      - run: make -C build -j8 tests
-      - run: make -C build -j8 check
-      - run: make -C build -j8 benchmarks
-      - run: make -C build run-benchmarks
-      - save_cache:
-          key: ccache-release-macos-{{ .Branch }}-{{ checksum "conanfile.txt" }}-{{ epoch }}
-          paths:
-            - ~/.ccache
-            - ~/.conan
-
 workflows:
   version: 2
   build_test_publish:
@@ -182,7 +135,3 @@ workflows:
           filters:
             tags:
               ignore: /.*/
-      - build-osx:
-          filters:
-            tags:
-              ignore: /.*/

.dockerignore

@@ -44,6 +44,7 @@ libvalhalla.la
 date_time_zonespec.csv
 mason/
 mason_packages/
+.DS_Store
 
 # scripts
 scripts/gdal-2.0.0/
@@ -59,9 +60,23 @@ CMakeLists.txt.user
 /CMakeSettings.json
 .idea
 /.tidytmp
+vcpkg*/
+overlay-ports-vcpkg/
+vcpkg-configuration.json
+run_route_scripts/
+test_requests/
 
-# documentation
-site/
-
-.DS_Store
+# docker
 Dockerfile
+
+# CI
+.github/
+.circleci/
+.pre-commit-config.yaml
+
+# docs etc
+site/
+docs/
+CONTRIBUTING.md
+NEWS 
+taginfo.json

.github/workflows/check_tz_releases.yml

@@ -20,6 +20,9 @@ jobs:
         run: |
           set -e 
 
+          git config user.name 'github-actions[bot]'
+          git config user.email 'github-actions[bot]@users.noreply.github.com'
+
           latest_tag=$(git -C third_party/tz ls-remote --tags --refs --quiet origin | tail --lines 1 | awk '{print $2}' | cut --delimiter='/' --fields=3 )
           latest_tag_commit=$(git -C third_party/tz rev-list -n 1 $latest_tag)
           current_commit=$(git -C ./third_party/tz rev-parse HEAD)
@@ -56,12 +59,11 @@ jobs:
               set -e
               # commit and push 
               git commit -m "bumped tz to ${latest_tag}"
-              git push origin 
+              git push origin "${new_branch}"
 
               # open new PR 
               body=$(echo "See [here](https://github.com/eggert/tz/blob/main/NEWS) for the latest changes made to tz.\
-              Created by workflow run [#${WORKFLOW_RUN_ID}](https://github.com/valhalla/valhalla/actions/runs/${WORKFLOW_RUN_ID}/job/${WORKFLOW_JOB_ID})." | xargs)
-
+              Created by workflow run [#${WORKFLOW_RUN_ID}](https://github.com/valhalla/valhalla/actions/runs/${WORKFLOW_RUN_ID})." | xargs)
               gh pr create --base master --head $new_branch --title "Bump tz to ${latest_tag}" --body "${body}"
 
               exit 1