repo cleanup + upgrade to clang-17 & gcc-13 (#500)

motis-project · May 9, 2024 · 47c95ba · 47c95ba
1 parent 5e8f4af
commit 47c95ba
Show file tree

Hide file tree

Showing 1,787 changed files with 214 additions and 132,447 deletions.
diff --git a/.clang-tidy.in b/.clang-tidy.in
@@ -78,7 +78,8 @@ Checks: "*,\
 -cert-dcl37-c,\
 -bugprone-reserved-identifier,\
 -cert-dcl51-cpp,\
--misc-confusable-identifiers"
+-misc-confusable-identifiers,\
+-misc-include-cleaner"
 WarningsAsErrors: '*'
 HeaderFilterRegex: '^${RELATIVE_SOURCE_DIR}(base|modules|test)/'
 AnalyzeTemporaryDtors: false

diff --git a/.github/workflows/unix.yml b/.github/workflows/unix.yml
@@ -24,46 +24,14 @@ jobs:
         run: |
           find base libs modules test \
             -type f -a \( -name "*.cc" -o -name "*.h" -o -name ".cuh" -o -name ".cu" \) \
-            -print0 | xargs -0 clang-format-16 -i
+            -print0 | xargs -0 clang-format-17 -i
 
       - name: Check for differences
         run: |
           git config --global --add safe.directory `pwd`
           git status --porcelain
           git status --porcelain | xargs -I {} -0 test -z \"{}\"
 
-  rsl-ui-checks:
-    runs-on: ubuntu-latest
-    defaults:
-      run:
-        working-directory: ui/rsl
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: pnpm Cache
-        uses: actions/cache@v4
-        with:
-          path: ~/.pnpm-store
-          key: pnpm-${{ runner.os }}-${{ hashFiles('ui/rsl/pnpm-lock.yaml') }}
-          restore-keys: |
-            pnpm-${{ runner.os }}-
-
-      - name: Install RSL Web Interface Dependencies
-        uses: pnpm/action-setup@v3
-        with:
-          version: ^8.15.4
-          run_install: |
-            - cwd: ui/rsl
-
-      - name: Formatting
-        run: pnpm run format-check
-
-      - name: ESLint
-        run: pnpm run lint
-
-      - name: TypeScript
-        run: pnpm run ts-check
-
   api-docs:
     runs-on: ubuntu-latest
     defaults:
@@ -88,7 +56,7 @@ jobs:
             - cwd: tools/protocol
 
       - name: Run Protocol Tool
-        run: pnpm start --skip rsl-ui
+        run: pnpm start
 
       - name: Upload API Docs
         uses: actions/upload-artifact@v4
@@ -164,12 +132,10 @@ jobs:
         if: matrix.config.tests == 'On'
         run: |
           ./build/motis --mode test \
-            --import.paths schedule:base/loader/test_resources/hrd_schedules/single-ice \
-            --dataset.begin 20151004 \
-            --dataset.write_serialized false \
+            --import.paths schedule-x:base/loader/test_resources/hrd_schedules/single-ice \
+            --nigiri.first_day 2015-10-04 \
             --nigiri.no_cache true \
-            --ris.db_max_size 1048576 \
-            --exclude_modules address osrm parking path ppr tiles tripbased gbfs transfers valhalla osr adr
+            --modules nigiri
 
       - name: Run Tests
         if: matrix.config.tests == 'On'
@@ -183,25 +149,6 @@ jobs:
       - name: Compile Web Interface
         run: cmake --build build --target motis-web-ui || (sleep 10 && cmake --build build --target motis-web-ui)
 
-      - name: pnpm Cache
-        uses: actions/cache@v4
-        with:
-          path: ~/.pnpm-store
-          key: pnpm-${{ runner.os }}-${{ hashFiles('ui/rsl/pnpm-lock.yaml') }}
-          restore-keys: |
-            pnpm-${{ runner.os }}-
-
-      - name: Install RSL Web Interface Dependencies
-        uses: pnpm/action-setup@v3
-        with:
-          version: ^8.15.4
-          run_install: |
-            - cwd: ./ui/rsl
-
-      - name: Compile RSL Web Interface
-        run: pnpm run build
-        working-directory: ./ui/rsl
-
       - name: Download API Docs
         uses: actions/download-artifact@v4
         with:
@@ -216,7 +163,6 @@ jobs:
           mv ui/web/{external_lib,img,js,style} motis/web/
           mv ui/web/{*.html,*.js,*.ico} motis/web/
           mv ui/web/openapi motis/web/
-          mv ui/rsl/dist motis/web/rsl
           mv build/motis motis/
           cp -r deps/osrm-backend/profiles motis/osrm-profiles
           cp -r deps/ppr/profiles motis/ppr-profiles
@@ -316,12 +262,10 @@ jobs:
         if: ${{ !matrix.config.skiptests }}
         run: |
           ${{ matrix.config.emulator }} ./build/motis --mode test \
-            --import.paths schedule:base/loader/test_resources/hrd_schedules/single-ice \
-            --dataset.begin 20151004 \
-            --dataset.write_serialized false \
+            --import.paths schedule-x:base/loader/test_resources/hrd_schedules/single-ice \
+            --nigiri.first_day 2015-10-04 \
             --nigiri.no_cache true \
-            --ris.db_max_size 1048576 \
-            --exclude_modules address osrm parking path ppr tiles tripbased gbfs transfers valhalla osr adr
+            --modules nigiri
 
       - name: Run Tests
         if: ${{ !matrix.config.skiptests }}
@@ -338,19 +282,6 @@ jobs:
           ln -s /elm ui/web/elm-stuff
           cmake --build build --target motis-web-ui || (sleep 10 && cmake --build build --target motis-web-ui)
 
-      - name: Install RSL Web Interface Dependencies
-        uses: pnpm/action-setup@v3
-        if: ${{ !matrix.config.skipui }}
-        with:
-          version: ^8.15.4
-          run_install: |
-            - cwd: ./ui/rsl
-
-      - name: Compile RSL Web Interface
-        if: ${{ !matrix.config.skipui }}
-        run: pnpm run build
-        working-directory: ./ui/rsl
-
       - name: Download API Docs
         if: matrix.config.artifact
         uses: actions/download-artifact@v4
@@ -371,7 +302,6 @@ jobs:
           mv ui/web/*.js motis/web/
           mv ui/web/*.ico motis/web/
           mv ui/web/openapi motis/web/
-          mv ui/rsl/dist motis/web/rsl
           mv build/motis motis/motis
           cp -r deps/osrm-backend/profiles motis/osrm-profiles
           cp -r deps/ppr/profiles motis/ppr-profiles
@@ -447,11 +377,12 @@ jobs:
         run: |
           ${{ matrix.config.emulator }} ./motis/motis \
             --mode test \
-            --modules routing lookup guesser ppr address intermodal osrm railviz tiles \
+            --modules nigiri osr adr tiles intermodal \
             --server.static_path motis/web \
             --import.data_dir data \
-            --import.paths schedule:data/hrd osm:data/aachen.osm.pbf \
-            --dataset.begin 20210809 \
+            --import.paths schedule-x:data/hrd osm:data/aachen.osm.pbf \
+            --nigiri.first_day 2015-10-04 \
+            --nigiri.no_cache true \
             --osrm.profiles motis/osrm-profiles/car.lua \
             --osrm.profiles motis/osrm-profiles/bike.lua \
             --ppr.profile motis/ppr-profiles/default.json \

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -80,11 +80,10 @@ jobs:
         run: >
           .\build\motis.exe
           --mode test
-          --import.paths schedule:base/loader/test_resources/hrd_schedules/single-ice
-          --dataset.begin 20151004
-          --dataset.write_serialized false
+          --import.paths schedule-x:base/loader/test_resources/hrd_schedules/single-ice
+          --nigiri.first_day 2015-10-04
           --nigiri.no_cache true
-          --exclude_modules address osrm parking path ppr tiles tripbased gbfs transfers valhalla osr adr
+          --modules nigiri
 
       - name: Run Tests
         if: matrix.config.webui == 'Off'
@@ -102,19 +101,6 @@ jobs:
           rm -r ui/web/elm-stuff
           rm -r ui/web/src
 
-      - name: Install RSL Web Interface Dependencies
-        uses: pnpm/action-setup@v3
-        if: matrix.config.webui == 'On'
-        with:
-          version: ^8.15.4
-          run_install: |
-            - cwd: ./ui/rsl
-
-      - name: Compile RSL Web Interface
-        if: matrix.config.webui == 'On'
-        run: pnpm run build
-        working-directory: ./ui/rsl
-
       # ==== API DOCS ====
       - name: Install Protocol Tool Dependencies
         if: matrix.config.mode == 'Release'
@@ -126,7 +112,7 @@ jobs:
 
       - name: Run Protocol Tool
         if: matrix.config.mode == 'Release'
-        run: pnpm start --skip rsl-ui
+        run: pnpm start
         working-directory: tools/protocol
 
       # ==== DISTRIBUTION ====
@@ -144,7 +130,6 @@ jobs:
           Copy-Item .\ui\web\external_lib,.\ui\web\img,.\ui\web\js,.\ui\web\style .\web\ -Recurse
           Copy-Item .\ui\web\*.html,.\ui\web\*.js,.\ui\web\*.ico .\web\
           Copy-Item .\ui\web\openapi .\web\ -Recurse
-          Copy-Item .\ui\rsl\dist .\web\rsl -Recurse
 
       - name: Move API Docs
         if: matrix.config.mode == 'Release'

diff --git a/.pkg b/.pkg
@@ -1,15 +1,11 @@
-[address-typeahead]
-  [email protected]:motis-project/address-typeahead.git
-  branch=master
-  commit=b6b5e60faac2921f1c0b3813da9c11731a3ca31d
 [cista]
   [email protected]:felixguendling/cista.git
   branch=master
   commit=f67b3bf31342e0685ec26c510f52328ceff8ff23
 [conf]
   [email protected]:motis-project/conf.git
   branch=master
-  commit=3aca4248da3f67d2a31ccce358ad9ee6102ab539
+  commit=f9bf4bd83bf55a2170725707e526cbacc45dcc66
 [ctx]
   [email protected]:motis-project/ctx.git
   branch=master
@@ -54,38 +50,22 @@
   [email protected]:motis-project/ppr.git
   branch=master
   commit=217585f424f6865693dd4aaa1a16f85daa574863
-[protobuf]
-  [email protected]:motis-project/protobuf.git
-  branch=main
-  commit=690e03babf0963d3da9615a2dae0891777842719
-[pugixml]
-  [email protected]:motis-project/pugixml.git
-  branch=master
-  commit=60175e80e2f5e97e027ac78f7e14c5acc009ce50
 [rapidjson]
   [email protected]:motis-project/rapidjson.git
   branch=master
   commit=e7a1ac95c7840c6f4351abead02b1f7a02874197
-[tar]
-  [email protected]:motis-project/tar.git
-  branch=master
-  commit=3a08b6575eb6a04e6b3d0977e6da3b61a91d62f2
 [tiles]
   [email protected]:motis-project/tiles.git
   branch=master
   commit=64f297ea0f782d04c89e82c6d478a1dd453e5f70
-[transfers]
-  [email protected]:motis-project/transfers.git
-  branch=main
-  commit=e66556443bad898ba98d418d53c96f5f03304833
 [utl]
   [email protected]:motis-project/utl.git
   branch=master
   commit=930d194f32a5da6c7d00e69bc53090548611c735
 [guess]
   [email protected]:motis-project/guess.git
   branch=master
-  commit=cd2700556d69de939ea67af976cc982c9c05ee3a
+  commit=cecba85dbd6796c92a7f9c4e274849bb6ef03494
 [boost]
   [email protected]:motis-project/boost.git
   branch=master
@@ -94,27 +74,15 @@
   [email protected]:motis-project/mimalloc.git
   branch=master
   commit=0087f000848de31b0090cb6f282348bd2fd3a9b8
-[rabbitmq-c]
-  [email protected]:motis-project/rabbitmq-c.git
-  branch=master
-  commit=5c57cc7ebbfba2d77c4fd6adfe6644586c87b3bb
 [nigiri]
   [email protected]:motis-project/nigiri.git
   branch=master
-  commit=7f0c17b2d363a400cfad191795fb543d7b28b68f
-[osmium]
-  [email protected]:motis-project/libosmium.git
-  branch=master
-  commit=6e6d6b3081cc8bdf25dda89730e25c36eb995516
-[valhalla]
-  [email protected]:motis-project/valhalla.git
-  branch=master
-  commit=bcc77cb2746e3d234a34c73bd13880c32a96e6cc
+  commit=5def8503fa8baf36cf5fc5fd69bef4e6c59e8456
 [osr]
   [email protected]:motis-project/osr.git
   branch=master
   commit=24179ff45f27eaee6c0b989854c86b20dfe8d1dd
 [adr]
   [email protected]:triptix-tech/adr.git
   branch=master
-  commit=f044654571cfe5dd4cdd5260b16d9907dc270644
+  commit=bef3f11a8c1642939e7047bcebf3d2f3528b23a3
diff --git a/.pkg.lock b/.pkg.lock
@@ -1,34 +1,33 @@
-4466310106395246297
-cista ebd5eb5cc7f82c414d3e060a3937d497189a103f
+3742374743462604182
+cista ed9ea61e4d3e287546f778729fafb5caca574658
 zlib fe8e13ffca867612951bc6baf114e5ac8b00f305
 boost 1c3f21c1fa8b149da89e2f6bcb48b28fff30fa5e
-cereal 5afa46f98d1c22627777c3f9d048fffe3f9763dc
-expat b8c26c40f1900899b95c795705e0252fc0c1350c
-googletest 34a46558609e05865c197f0260ab36daa7cbbb6e
-guess 5acaeaacca154bd20987806f9626be5e3b87e1c5
-libosmium d5cc2a02d997c2b464d37d37c3a75cd9efa23dc4
-protozero 8c9f3fa97c2cfdceef86d0b61818ae98e9328f29
-fmt 3503709ac2ba2a938676e6b2071f1362294e278b
-utl 4c1503afe58e209977d9a1e3db6a6b271a50c521
-address-typeahead b6b5e60faac2921f1c0b3813da9c11731a3ca31d
-conf a32d491bd54800310a53ccba13f4ee9f6736ff3e
+conf f9bf4bd83bf55a2170725707e526cbacc45dcc66
 context 797dd16e2b5e959997ddcd5bdeac4f80931169b6
+fmt 3503709ac2ba2a938676e6b2071f1362294e278b
+googletest 34a46558609e05865c197f0260ab36daa7cbbb6e
+utl fd7425b1a57a4b887318ba8c41a3184f8c4a50c5
 ctx d514aa0b0001596b0317abaa17a5a689dc601a55
 res 7d97784ba785ce8a2677ea77164040fde484fb04
 date 2d2c46a39bbf582dc663be1af926b4d58b2e0c9a
 flatbuffers a2028f13ae6aafe855010b43a0c93f86e04d9717
 doctest 70e8f76437b76dd5e9c0a2eb9b907df190ab71a0
 geo ee76668f0f0454e4acd3c769e00c6868620e3490
+utf8proc 779b780da3b99d123133eb99707b65c7e4324cc8
+guess cecba85dbd6796c92a7f9c4e274849bb6ef03494
 lmdb 9bd01f14f549d8202413c4cd5f49b066b0a22b66
 mimalloc 2a557cafb2e9e7c872358a83a63c62a7e14330b3
 miniz 1edbdece9d71dc65c6ff405572ee37cbdcef7af4
 libressl 39c1bf084d5c179d7bbce7ba902fffbebff0ee15
 net 785b39c08212732e510305f0eef18de70f19b15e
-abseil-cpp f2b3825f36e37fddd47c5c395096e9b1e99eca12
-protobuf 690e03babf0963d3da9615a2dae0891777842719
+abseil-cpp ba5240842d352b4b67a32092453a2fe5fe53a62e
+protobuf d8136b9c6a62db6ce09900ecdeb82bb793096cbd
 unordered_dense c11595a7743d20622637584bddf77243d72ae152
 wyhash 1e012b57fc2227a9e583a57e2eacb3da99816d99
-nigiri 7f0c17b2d363a400cfad191795fb543d7b28b68f
+nigiri 5def8503fa8baf36cf5fc5fd69bef4e6c59e8456
+expat b8c26c40f1900899b95c795705e0252fc0c1350c
+libosmium d5cc2a02d997c2b464d37d37c3a75cd9efa23dc4
+protozero 8c9f3fa97c2cfdceef86d0b61818ae98e9328f29
 rapidjson 9ece673b648b19d0f1995b82d402c9a6fc0eb277
 LuaJIT babeae2c3311bed245ee86f3e35a1f244e3da60b
 clipper 904f0e6644c7f01c176443613be8f7788d59c658
@@ -44,22 +43,6 @@ tbb b3011be5060ec1be43c76d4a8cc80d5550adb31d
 osrm-backend a7fe58cf3b6a54968d1248e0b4299d49db02ff2e
 cpptoml 2133029ec819e8398e96fa679993b269f21ff9f2
 ppr 217585f424f6865693dd4aaa1a16f85daa574863
-pugixml 60175e80e2f5e97e027ac78f7e14c5acc009ce50
-rabbitmq-c 5c57cc7ebbfba2d77c4fd6adfe6644586c87b3bb
-zstd bce26304a57dd504ae7ae51f384bf9292d7e3acb
-tar 3a08b6575eb6a04e6b3d0977e6da3b61a91d62f2
-transfers e66556443bad898ba98d418d53c96f5f03304833
-OSM-binary 0be467dc07f2ee5271fb1e61c7c364dd20f29be0
-cpp-statsd-client b60bc7bb930df664b4ab9573ad8bee80d29dc72d
-cxxopts a68479e98d6694d4bcfc7af9fc09527888a740b6
-dirent 11a4d8ab1bf5b0123f039127bc75b52b6702779e
-just_gtfs 94b35eea71c09aefccf994c28ee7d373de4460e6
-lz4 c4765545ebb14b0a56c663e21923166923f8280e
-microtar c71afe40887ae1a187ec24cedd85c765058d9978
-robin-hood-hashing bd632059ea0bb5cf444b33bdfb4eba2118300c62
-spatialite 7b8cd6447ac8632bd2c6c8ff9fbc10151742ef18
-valhalla bcc77cb2746e3d234a34c73bd13880c32a96e6cc
 FTXUI dd6a5d371fd7a3e2937bb579955003c54b727233
-utf8proc 1cb28a66ca79a0845e99433fd1056257456cef8b
 tg 20c0f298b8ce58de29a790290f44dca7c4ecc364
-adr f044654571cfe5dd4cdd5260b16d9907dc270644
+adr bef3f11a8c1642939e7047bcebf3d2f3528b23a3