Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/dev-2.x' into config-check
Browse files Browse the repository at this point in the history
  • Loading branch information
leonardehrenfried committed Mar 11, 2024
2 parents e6ba88e + 0532203 commit 3b80bf2
Show file tree
Hide file tree
Showing 342 changed files with 109,635 additions and 6,907 deletions.
1 change: 1 addition & 0 deletions .github/workflows/debug-client.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
9 changes: 5 additions & 4 deletions .github/workflows/performance-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,11 @@ jobs:
jfr-delay: "35s"
profile: core

- location: skanetrafiken
iterations: 1
jfr-delay: "50s"
profile: core
# disabled due to https://github.com/opentripplanner/OpenTripPlanner/issues/5702
#- location: skanetrafiken
# iterations: 1
# jfr-delay: "50s"
# profile: core

# extended locations that are run only after merging to dev-2.x

Expand Down
1 change: 1 addition & 0 deletions .github/workflows/post-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ jobs:

- name: Install xmllint
run: |
sudo apt-get update
sudo apt-get install -y libxml2-utils
- name: Configure git user
Expand Down
Loading

0 comments on commit 3b80bf2

Please sign in to comment.