Merge remote-tracking branch 'upstream/dev-2.x' into layer-groups

.github/workflows/cibuild.yml

@@ -154,7 +154,7 @@ jobs:
           # schema hasn't changed.
           # example commit: https://github.com/opentripplanner/docs/commit/45e6ddf8e4a4
           
-          SCHEMA_FILE_MODIFIED=`git log -n 1 --pretty=format:%ct src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls`
+          SCHEMA_FILE_MODIFIED=`git log -n 1 --pretty=format:%ct application/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls`
           echo "schema modified at ${SCHEMA_FILE_MODIFIED}"
           git checkout $LOCAL_BRANCH
           DOCS_MODIFIED=`git log -n 1 --pretty=format:%ct api/dev-2.x/graphql-gtfs/introduction.html`
@@ -181,7 +181,7 @@ jobs:
         with:
           node-version: 16
       - name: Run code generator
-        working-directory: src/main/java/org/opentripplanner/apis/gtfs/generated
+        working-directory: application/src/main/java/org/opentripplanner/apis/gtfs/generated
         run: |
           yarn install
           yarn generate

.github/workflows/debug-client.yml

@@ -76,8 +76,8 @@ jobs:
           git checkout dev-2.x
           git pull --rebase
           
-          CLIENT_HTML_OUTPUT=src/client/index.html
-          mkdir -p src/client/
+          CLIENT_HTML_OUTPUT=application/src/client/index.html
+          mkdir -p application/src/client/
           cp client/output/index.html ${CLIENT_HTML_OUTPUT}
           
           # just to debug

.github/workflows/performance-test.yml

@@ -88,17 +88,18 @@ jobs:
       - name: Build graph
         if: matrix.profile == 'core' || github.ref == 'refs/heads/dev-2.x'
         run: |
-          cp target/otp-*-SNAPSHOT-shaded.jar otp.jar
+          cp application/target/otp-*-SNAPSHOT-shaded.jar otp.jar
           java -Xmx32G -jar otp.jar --build --save test/performance/${{ matrix.location }}/
 
       - name: Run speed test
         if: matrix.profile == 'core' || github.ref == 'refs/heads/dev-2.x'
+        working-directory: application
         env:
           PERFORMANCE_INFLUX_DB_PASSWORD: ${{ secrets.PERFORMANCE_INFLUX_DB_PASSWORD }}
           SPEEDTEST_LOCATION: ${{ matrix.location }}
           MAVEN_OPTS: "-Xmx50g -XX:StartFlightRecording=delay=${{ matrix.jfr-delay }},duration=30m,filename=${{ matrix.location}}-speed-test.jfr -Dmaven.repo.local=/home/lenni/.m2/repository/"
         run: |
-          mvn exec:java -Dexec.mainClass="org.opentripplanner.transit.speed_test.SpeedTest" -Dexec.classpathScope=test -Dexec.args="--dir=test/performance/${{ matrix.location }} -p md -n ${{ matrix.iterations }} -i 3 -0" -P prettierSkip
+          mvn exec:java -Dexec.mainClass="org.opentripplanner.transit.speed_test.SpeedTest" -Dexec.classpathScope=test -Dexec.args="--dir=../test/performance/${{ matrix.location }} -p md -n ${{ matrix.iterations }} -i 3 -0" -P prettierSkip
 
       - name: Archive travel results file
         if: matrix.profile == 'core' || github.ref == 'refs/heads/dev-2.x'