Merge remote-tracking branch 'upstream/dev-2.x' into gtfsrt-module-tests

.git-blame-ignore-revs

@@ -4,3 +4,8 @@
 # project-wide reformatting with prettier
 9c9dd613489a348d2381acdcbeab8f86589154d7
 
+# graphql test and documentation reformatting with prettier
+12c51f44f204db31d34a1eeb0d59204226e0fa5d
+
+# reorder and reformat GTFS GraphQL API schema file with graphql-java
+14051fab312a67cae9a460aaf0bbc77223bec624

.github/workflows/debug-client.yml

@@ -3,10 +3,10 @@ name: Debug client
 on:
   push:
     paths:
-      - 'client-next/**'
+      - 'client/**'
   pull_request:
     paths:
-      - 'client-next/**'
+      - 'client/**'
 
 # to avoid conflicts, make sure that only one workflow pushes to Github at the same time
 concurrency:
@@ -38,7 +38,7 @@ jobs:
         run: echo "VERSION=`date +%Y/%m/%Y-%m-%dT%H:%M`" >> $GITHUB_ENV
 
       - name: Build debug client
-        working-directory: client-next
+        working-directory: client
         run: |
           npm install
           npm run build -- --base https://cdn.jsdelivr.net/gh/opentripplanner/debug-client-assets@main/${VERSION}/
@@ -65,7 +65,7 @@ jobs:
           
           # Copy the compiled output to a versioned folder
           mkdir -p $VERSION
-          rsync -r client-next/output/* ./$VERSION/
+          rsync -r client/output/* ./$VERSION/
           git add $VERSION
           git commit -am "Add version ${VERSION} of debug client"
           
@@ -76,9 +76,9 @@ jobs:
           git checkout dev-2.x
           git pull --rebase
           
-          CLIENT_HTML_OUTPUT=src/client/debug-client-preview/index.html
-          mkdir -p src/client/debug-client-preview/
-          cp client-next/output/index.html ${CLIENT_HTML_OUTPUT}
+          CLIENT_HTML_OUTPUT=src/client/index.html
+          mkdir -p src/client/
+          cp client/output/index.html ${CLIENT_HTML_OUTPUT}
           
           # just to debug
           cat ${CLIENT_HTML_OUTPUT}

.github/workflows/prune-container-images.yml

@@ -19,4 +19,4 @@ jobs:
           # remove all snapshot container images that have not been pulled for over a year
           # --keep-semver makes sure that any image with a x.y.z version scheme is unaffected by this
           pip install prune-container-repo==0.0.4
-          prune-container-repo -u ${CONTAINER_REGISTRY_USER} -r ${CONTAINER_REPO} --days=90 --keep-semver --activate
+          prune-container-repo -u ${CONTAINER_REGISTRY_USER} -r ${CONTAINER_REPO} --days=365 --keep-semver --activate

client-next/README.md → client/README.md

@@ -26,15 +26,15 @@ The dev and production builds require graphql schema to be present at
 
 ## Getting started (development)
 
-Change directory to `client-next` (current) if you haven't already.
+Change directory to `client` (current) if you haven't already.
 
     npm install
 
 Then
 
     npm run dev
 
-The debug client will now be available at `http://localhost:5173/debug-client-preview`. It has
+The debug client will now be available at `http://localhost:5173/`. It has
 hot reloading enabled, so you don't have to restart it when you save files.
 
 If you change graphql code during development you can issue the following command:
@@ -45,7 +45,7 @@ You don't have to restart the development server for the changes to take effect.
 
 ## Build for production
 
-Change directory to `client-next` (current) if you haven't already.
+Change directory to `client` (current) if you haven't already.
 
     npm install