Skip to content

Commit

Permalink
Merge branch 'dev-2.x' into enable-renovate-for-debug-ui
Browse files Browse the repository at this point in the history
  • Loading branch information
testower committed Feb 15, 2024
2 parents c225e1e + 821a135 commit 6854557
Show file tree
Hide file tree
Showing 601 changed files with 17,854 additions and 9,283 deletions.
28 changes: 14 additions & 14 deletions .github/workflows/cibuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -65,9 +65,9 @@ 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
Expand All @@ -91,7 +91,7 @@ jobs:

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')
Expand All @@ -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'

Expand All @@ -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

Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/debug-client.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/performance-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/post-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
steps:

- name: Checkout
uses: actions/checkout@v3.1.0
uses: actions/checkout@v4
with:
token: ${{ secrets.CHANGELOG_TOKEN }}

Expand Down Expand Up @@ -62,7 +62,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 }}

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
OpenTripPlanner (OTP) is an open source multi-modal trip planner, focusing on travel by scheduled
public transportation in combination with bicycling, walking, and mobility services including bike
share and ride hailing. Its server component runs on any platform with a Java virtual machine (
including Linux, Mac, and Windows). It exposes REST and GraphQL APIs that can be accessed by various
including Linux, Mac, and Windows). It exposes GraphQL APIs that can be accessed by various
clients including open source Javascript components and native mobile applications. It builds its
representation of the transportation network from open data in open standard file formats (primarily
GTFS and OpenStreetMap). It applies real-time updates and alerts with immediate visibility to
Expand Down
3 changes: 2 additions & 1 deletion client-next/.env
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
VITE_API_URL=/otp/routers/default/transmodel/index/graphql
VITE_API_URL=/otp/routers/default/transmodel/index/graphql
VITE_DEBUG_STYLE_URL=/otp/routers/default/inspector/vectortile/style.json
3 changes: 2 additions & 1 deletion client-next/.env.development
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
VITE_API_URL=http://localhost:8080/otp/routers/default/transmodel/index/graphql
VITE_API_URL=http://localhost:8080/otp/routers/default/transmodel/index/graphql
VITE_DEBUG_STYLE_URL=http://localhost:8080/otp/routers/default/inspector/vectortile/style.json
1 change: 1 addition & 0 deletions client-next/.npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
save-exact=true
Loading

0 comments on commit 6854557

Please sign in to comment.