Merge branch 'dev-2.x' into gmap-mobility-profile

ibi-group · Mar 28, 2024 · 18fedb9 · 18fedb9
2 parents fbddde0 + a372695
commit 18fedb9
Show file tree

Hide file tree

Showing 552 changed files with 114,995 additions and 11,204 deletions.
diff --git a/.github/workflows/cibuild.yml b/.github/workflows/cibuild.yml
@@ -20,20 +20,20 @@ jobs:
     timeout-minutes: 20
     steps:
       # Starting in v2.2 checkout action fetches all tags when fetch-depth=0, for auto-versioning.
-      - uses: actions/checkout@v3.3.0
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
       # nodejs is needed because the dynamic download of it via the prettier maven plugin often
       # times out
       # Example: https://github.com/opentripplanner/OpenTripPlanner/actions/runs/4490450225/jobs/7897533439
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
           node-version: 18
 
       # Java setup step completes very fast, no need to run in a preconfigured docker container
       - name: Set up JDK 21
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: 21
           distribution: temurin
@@ -65,17 +65,17 @@ jobs:
     timeout-minutes: 20
     runs-on: windows-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up JDK 21
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: 21
           distribution: temurin
           cache: maven
       # on windows there are frequent failures caused by page files being too small
       # https://github.com/actions/virtual-environments/issues/785
       - name: Configure Windows Pagefile
-        uses: al-cheb/configure-pagefile-action@v1.3
+        uses: al-cheb/configure-pagefile-action@v1.4
       - name: Run tests
         run: mvn --batch-mode test -P prettierSkip
 
@@ -87,11 +87,11 @@ jobs:
       LOCAL_BRANCH: local-pages
       REMOTE_BRANCH: main
       TOKEN: ${{ secrets.CHANGELOG_TOKEN }}
-      MASTER_BRANCH_VERSION: 2.4.0
+      MASTER_BRANCH_VERSION: 2.5.0
 
     steps:
 
-      - uses: actions/checkout@v3.3.0
+      - uses: actions/checkout@v4
         # this is necessary so that the correct credentials are put into the git configuration
         # when we push to dev-2.x and push the HTML to the git repo
         if: github.event_name == 'push' && (github.ref == 'refs/heads/dev-2.x' || github.ref == 'refs/heads/master')
@@ -101,7 +101,7 @@ jobs:
           # was modified last
           fetch-depth: 1000
 
-      - uses: actions/checkout@v3.3.0
+      - uses: actions/checkout@v4
         # for a simple PR where we don't push, we don't need any credentials
         if: github.event_name == 'pull_request'
 
@@ -113,7 +113,7 @@ jobs:
         if: github.event_name == 'pull_request'
         run: mkdocs build
 
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
           node-version: 18
 
@@ -174,8 +174,8 @@ jobs:
     if: github.repository_owner == 'opentripplanner'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3.1.0
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
           node-version: 16
       - name: Run code generator
@@ -184,7 +184,7 @@ jobs:
           yarn install
           yarn generate
       - name: Set up JDK 21
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: 21
           distribution: temurin
@@ -199,16 +199,16 @@ jobs:
       - build-windows
       - build-linux
     steps:
-      - uses: actions/checkout@v3.1.0
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Set up JDK 21
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: 21
           distribution: temurin
           cache: maven
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
           node-version: 18
       - name: Build container image with Jib, push to Dockerhub

diff --git a/.github/workflows/debug-client.yml b/.github/workflows/debug-client.yml
@@ -30,7 +30,7 @@ jobs:
       - uses: actions/checkout@v4
         if: github.event_name == 'pull_request'
 
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
           node-version: 18
 
@@ -42,6 +42,7 @@ jobs:
         run: |
           npm install
           npm run build -- --base https://cdn.jsdelivr.net/gh/opentripplanner/debug-client-assets@main/${VERSION}/
+          npm run coverage
 
       - name: Deploy compiled assets to repo
         if: github.event_name == 'push' && github.ref == 'refs/heads/dev-2.x'

diff --git a/.github/workflows/performance-test.yml b/.github/workflows/performance-test.yml
@@ -60,14 +60,14 @@ jobs:
             profile: extended
 
     steps:
-      - uses: actions/checkout@v3.1.0
+      - uses: actions/checkout@v4
         if: matrix.profile == 'core' || github.ref == 'refs/heads/dev-2.x'
         with:
           fetch-depth: 0
 
       - name: Set up JDK
         if: matrix.profile == 'core' || github.ref == 'refs/heads/dev-2.x'
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: 21
           distribution: temurin

diff --git a/.github/workflows/post-merge.yml b/.github/workflows/post-merge.yml
@@ -16,7 +16,7 @@ jobs:
     steps:
 
       - name: Checkout
-        uses: actions/checkout@v3.1.0
+        uses: actions/checkout@v4
         with:
           token: ${{ secrets.CHANGELOG_TOKEN }}
 
@@ -54,6 +54,7 @@ jobs:
 
       - name: Install xmllint
         run: |
+          sudo apt-get update
           sudo apt-get install -y libxml2-utils
 
       - name: Configure git user
@@ -62,7 +63,7 @@ jobs:
           git config --global user.email '[email protected]'
 
       - name: Checkout
-        uses: actions/checkout@v3.1.0
+        uses: actions/checkout@v4
         with:
           token: ${{ secrets.CHANGELOG_TOKEN }}
 

diff --git a/README.md b/README.md
@@ -14,7 +14,7 @@ GTFS and OpenStreetMap). It applies real-time updates and alerts with immediate
 clients, finding itineraries that account for disruptions and service changes.
 
 Note that this branch contains **OpenTripPlanner 2**, the second major version of OTP, which has
-been under development since 2018. The latest version of OTP is v2.4.0, released in September 2023.
+been under development since 2018. The latest version of OTP is v2.5.0, released in March 2024.
 
 If you do not want to use this version, please switch to the final 1.x release
 tag `v1.5.0` or the `dev-1.x` branch.
@@ -71,5 +71,5 @@ found in the main documentation.
 
 ## OTP Ecosystem
 
-- [awesome-transit](https://github.com/CUTR-at-USF/awesome-transit) Community list of transit APIs,
+- [awesome-transit](https://github.com/MobilityData/awesome-transit) Community list of transit APIs,
   apps, datasets, research, and software.