Merge branch 'master' into feat/valhalla

Author: alexsegura

.env.dist

@@ -152,6 +152,7 @@ RDC_WEBHOOK_SECRET=
 ###> feature flags ###
 RFM_ENABLED=0
 RDC_ENABLED=0
+ZELTY_ENABLED=0
 ###< feature flags ###
 
 ###> acseo/typesense-bundle ###

.github/actions/run-coopcycle-web/action.yml

@@ -1,5 +1,14 @@
 name: Run CoopCycle Web
 
+inputs:
+  wait-for-webpack:
+    description: >
+      Wait for the first webpack build to finish. Only needed by jobs that render
+      pages including the Encore entrypoints (the e2e suite). The API test suites do
+      not, and waiting costs ~2.5 minutes.
+    required: false
+    default: 'true'
+
 runs:
   using: "composite"
   steps:
@@ -10,13 +19,26 @@ runs:
   - name: Pull Docker images
     shell: bash
     run: docker compose pull --ignore-pull-failures
+  # Downloading the extract and running extract/partition/customize takes ~4 minutes,
+  # and the result only changes when the OSRM version or the profile changes — both of
+  # which are pinned by docker/osrm/Dockerfile, so it is part of the cache key.
+  - name: Restore OSRM data
+    id: osrm-cache
+    uses: actions/cache@v4
+    with:
+      path: var/osrm
+      key: osrm-paris-france-${{ hashFiles('docker/osrm/Dockerfile') }}
   - name: Prepare OSRM data
+    if: steps.osrm-cache.outputs.cache-hit != 'true'
     shell: bash
     run: |
       docker compose run -T --rm osrm wget --no-check-certificate https://coopcycle-assets.sfo2.digitaloceanspaces.com/osm/paris-france.osm.pbf -O /data/data.osm.pbf
       docker compose run -T --rm osrm osrm-extract -p /opt/bicycle.lua /data/data.osm.pbf
       docker compose run -T --rm osrm osrm-partition /data/data.osrm
       docker compose run -T --rm osrm osrm-customize /data/data.osrm
+      # osrm-routed only reads data.osrm* (see docker/osrm/start.sh), so the ~180 MB
+      # source extract does not need to be carried around in the cache.
+      docker compose run -T --rm osrm rm -f /data/data.osm.pbf
   - name: Start Docker containers
     shell: bash
     # specify -f docker-compose.yml explicitly, because we don't want to load docker-compose.override.yml
@@ -25,6 +47,7 @@ runs:
     shell: bash
     run: until docker inspect --format='{{ .State.Health.Status }}' $(docker compose ps -q php) | grep -wq healthy; do sleep 5; done
   - name: Wait webpack
+    if: inputs.wait-for-webpack == 'true'
     shell: bash
     run: until [ -f "web/build/entrypoints.json" ]; do sleep 5; done
   - name: Create database

.github/actions/upload-symfony-logs/action.yml

@@ -1,5 +1,11 @@
 name: Upload Symfony logs
 
+inputs:
+  name:
+    description: 'Name of the artifact. Must be unique inside a workflow run, so it has to include the shard when the job runs in a matrix.'
+    required: false
+    default: 'symfony-logs'
+
 runs:
   using: "composite"
   steps:
@@ -9,5 +15,5 @@ runs:
     - name: Upload Symfony logs
       uses: actions/upload-artifact@v4
       with:
-        name: symfony-logs
+        name: ${{ inputs.name }}
         path: symfony_logs.log

.github/workflows/lint_js.yml

@@ -1,5 +1,8 @@
 name: Lint JS
 on: push
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 env:
   APP_ENV: test
   NODE_ENV: test

.github/workflows/lint_php.yml

@@ -1,5 +1,8 @@
 name: Lint PHP
 on: push
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 env:
   APP_ENV: test
 jobs:

.github/workflows/test_behat.yml

@@ -1,5 +1,8 @@
 name: API Tests
 on: push
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 env:
   APP_ENV: test
   NODE_ENV: test
@@ -27,6 +30,10 @@ jobs:
       - uses: actions/checkout@v4
       - name: Run CoopCycle Web
         uses: ./.github/actions/run-coopcycle-web
+        with:
+          # The Behat suite only drives the API, it never renders a page
+          # including the Encore entrypoints
+          wait-for-webpack: 'false'
         timeout-minutes: 10
       - name: Run Behat
         run: make behat ARGS="-f progress"

.github/workflows/test_component.yml

@@ -1,5 +1,8 @@
 name: Component Tests
 on: push
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 env:
   APP_ENV: test
   NODE_ENV: test

.github/workflows/test_e2e.yml

@@ -1,5 +1,8 @@
 name: E2E tests
 on: push
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 env:
   APP_ENV: test
   NODE_ENV: test
@@ -11,7 +14,10 @@ jobs:
       matrix:
         php_version:
           - '8.3'
-          - '8.4'
+        # The specs are split round-robin over the sorted spec list, see the
+        # "Select the specs for this shard" step. To split the suite further, add a
+        # shard here *and* bump SHARD_TOTAL below to match.
+        shard: [1, 2, 3, 4]
       fail-fast: false
     env:
       GEOCODE_EARTH_API_KEY: ${{ secrets.GEOCODE_EARTH_API_KEY }}
@@ -22,12 +28,28 @@ jobs:
       AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
       AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
       PHP_VERSION: ${{ matrix.php_version }}
+      # Number of entries in matrix.shard. Deliberately not strategy.job-total, which
+      # would also count any other matrix dimension (a second PHP version, say) and
+      # would then silently make each shard run only a fraction of its specs.
+      SHARD_TOTAL: 4
     steps:
       - name: Set timezone
         uses: szenius/set-timezone@v2.0
         with:
           timezoneLinux: "Europe/Paris"
       - uses: actions/checkout@v4
+      # Round-robin over the sorted spec list rather than a hand-maintained list per
+      # shard: every spec is always picked up by exactly one shard, including new ones,
+      # and interleaving the sorted order spreads the slow directories evenly.
+      - name: Select the specs for this shard
+        id: shard
+        run: |
+          specs=$(find cypress/e2e -name '*.cy.js' | sort \
+            | awk -v i="${{ matrix.shard }}" -v n="$SHARD_TOTAL" '(NR - 1) % n == (i - 1)' \
+            | paste -sd, -)
+          if [ -z "$specs" ]; then echo "No spec selected for this shard" >&2; exit 1; fi
+          echo "Shard ${{ matrix.shard }}/$SHARD_TOTAL: $(echo "$specs" | tr ',' '\n' | wc -l) specs"
+          echo "specs=$specs" >> "$GITHUB_OUTPUT"
       - name: Run CoopCycle Web
         uses: ./.github/actions/run-coopcycle-web
         timeout-minutes: 10
@@ -43,14 +65,13 @@ jobs:
           # Install only Cypress binary; everything else is already installed by the webpack docker image
           # https://docs.cypress.io/app/continuous-integration/overview#Missing-binary
           install-command: npx cypress install
-          spec: |
-            cypress/e2e/**/*.cy.js
+          spec: ${{ steps.shard.outputs.specs }}
         # after the test run completes store videos and any screenshots
       - name: Upload images for failed tests
         uses: actions/upload-artifact@v4
         if: failure()
         with:
-          name: cypress-screenshots
+          name: cypress-screenshots-shard-${{ matrix.shard }}
           path: cypress/screenshots
           if-no-files-found: ignore # 'warn' or 'error' are also available, defaults to `warn`
       - name: Show Symfony warnings on failure
@@ -59,3 +80,5 @@ jobs:
       - name: Upload Symfony logs on failure
         if: failure()
         uses: ./.github/actions/upload-symfony-logs
+        with:
+          name: symfony-logs-shard-${{ matrix.shard }}

.github/workflows/test_js.yml

@@ -1,5 +1,8 @@
 name: Unit Tests (JS)
 on: push
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 env:
   APP_ENV: test
   NODE_ENV: test
@@ -10,14 +13,25 @@ jobs:
     env:
       STRIPE_PUBLISHABLE_KEY: ${{ secrets.STRIPE_PUBLISHABLE_KEY }}
       STRIPE_SECRET_KEY: ${{ secrets.STRIPE_SECRET_KEY }}
+      # Some assertions compare formatted numbers, which depend on the ambient ICU
+      # locale. The webpack container this used to run in has no LANG set, so Node
+      # falls back to en-US; pin the same thing here.
+      LANG: C.UTF-8
     steps:
       - name: Set timezone
         uses: szenius/set-timezone@v2.0
         with:
           timezoneLinux: "Europe/Paris"
       - uses: actions/checkout@v4
-      - name: Run CoopCycle Web
-        uses: ./.github/actions/run-coopcycle-web
-        timeout-minutes: 10
+      # Jest only runs jsdom unit tests under js/, it needs neither the app nor any of
+      # the containers, so it does not use ./.github/actions/run-coopcycle-web. Node 22
+      # matches the "node:22-alpine" image these tests used to run in.
+      - uses: actions/setup-node@v4
+        with:
+          node-version: '22'
+          cache: 'npm'
+      - name: Install dependencies
+        # The Cypress binary is not needed to run Jest, and takes a while to download
+        run: CYPRESS_INSTALL_BINARY=0 npm ci
       - name: Run Jest
-        run: docker compose exec -T webpack npm run jest
+        run: npm run jest

.github/workflows/test_php_unit.yml

@@ -1,5 +1,8 @@
 name: Unit Tests (PHP)
 on: push
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 env:
   APP_ENV: test
   NODE_ENV: test
@@ -25,6 +28,9 @@ jobs:
       - uses: actions/checkout@v4
       - name: Run CoopCycle Web
         uses: ./.github/actions/run-coopcycle-web
+        with:
+          # PHPUnit never renders a page including the Encore entrypoints
+          wait-for-webpack: 'false'
         timeout-minutes: 10
       - name: Run PHPUnit
         run: |