Backport of integration into 2.3

.github/scripts/validate-and-lint.sh

@@ -12,8 +12,11 @@ echo "Validating XML file structure and linting XSD and XML files ..."
 PARSING_ERROR=0
 # Iterate all XML and XSD files
 while IFS= read -r -d $'\0' filename; do
+  if [[ "$filename" =~ \.git/ ]]; then
+    continue  # Skip files inside the .git directory
+  fi
   # Prettify the file using xmllint and save the result to ${filename}.pretty
-  if XMLLINT_INDENT=$'\t' xmllint --encode UTF-8 --pretty 1 "${filename}" >"${filename}.pretty"; then
+  if XMLLINT_INDENT=$'\t' xmllint --encode UTF-8 --format --pretty 1 "${filename}" >"${filename}.pretty"; then
     # Remove lines containing the term "xmlspy" to get rid of advertising this and save the result as ${filename}
     grep -i -v "xmlspy" "${filename}.pretty" >"${filename}"
   else
@@ -22,7 +25,7 @@ while IFS= read -r -d $'\0' filename; do
   fi
   # Remove temp file
   rm "${filename}.pretty"
-done < <(/usr/bin/find . -type f \( -name "*.xsd" -or -name "*.xml" \) -not -path "./git" -print0)
+done < <(/usr/bin/find . -type f \( -name "*.xsd" -or -name "*.xml" -or -name "*.wsdl" \) -not -path "./.git/*" -print0)
 
 if [ ${PARSING_ERROR} -ne 0 ]; then
   exit ${PARSING_ERROR}

.github/workflows/ci.yml

@@ -35,6 +35,9 @@ jobs:
       - name: Validate SIRI XML examples
         run: ./.github/scripts/validate-examples.sh
 
+      - name: Generate documentation tables
+        run: ./docs/generate-tables.sh
+
       - name: Commit changes
         uses: EndBug/add-and-commit@v9 # https://github.com/marketplace/actions/add-commit
         with:

.github/workflows/deploy-pages.yml

@@ -0,0 +1,38 @@
+name: Deploy documentation tables
+
+on:
+  push:
+    branches: ["master"]
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
+permissions:
+  contents: read
+  pages: write
+  id-token: write
+
+# Allow one concurrent deployment
+concurrency:
+  group: "pages"
+  cancel-in-progress: true
+
+jobs:
+  deploy:
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Setup Pages
+        uses: actions/configure-pages@v2
+      - name: Upload artifact
+        uses: actions/upload-pages-artifact@v1
+        with:
+          path: './docs/generated'
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v1

Siri.spp

@@ -9,6 +9,7 @@
 			<File FilePath="xsd\siri_all_functionalServices.xsd" HomeFolder="Yes"/>
 			<File FilePath="xsd\siri_connectionMonitoring_service.xsd" HomeFolder="Yes"/>
 			<File FilePath="xsd\siri_connectionTimetable_service.xsd" HomeFolder="Yes"/>
+			<File FilePath="xsd\siri_controlAction_service.xsd" HomeFolder="Yes"/>
 			<File FilePath="xsd\siri_discovery.xsd" HomeFolder="Yes"/>
 			<File FilePath="xsd\siri_estimatedTimetable_service.xsd" HomeFolder="Yes"/>
 			<File FilePath="xsd\siri_facilityMonitoring_service.xsd" HomeFolder="Yes"/>
@@ -41,7 +42,7 @@
 				<File FilePath="xsd\siri_model\siri_all.xsd"/>
 				<File FilePath="xsd\siri_model\siri_all_journeyModel.xsd"/>
 				<File FilePath="xsd\siri_model\siri_all_model.xsd"/>
-				<File FilePath="xsd\siri_model\siri_all_situation.xsd"/>
+				<File FilePath="xsd\siri_model\siri_all_situation.xsd" HomeFolder="Yes"/>
 				<File FilePath="xsd\siri_model\siri_facilities.xsd" HomeFolder="Yes"/>
 				<File FilePath="xsd\siri_model\siri_feature_support.xsd" HomeFolder="Yes"/>
 				<File FilePath="xsd\siri_model\siri_interchangeJourney.xsd" HomeFolder="Yes"/>

docs/README.md

@@ -0,0 +1,36 @@
+# SIRI (Service interface for real-time information relating to public transport operations) XML schema
+**(C) 2006-2025 NeTEx, CEN, Crown Copyright**
+
+## Schemas for:
+
+- Core
+- Part 1 (Context and Framework) 
+- Part 2 (Communications)
+- Part 3 (Functional Service Interfaces: Production Timetable, Estimated Timetable, Stop Monitoring, Vehicle Monitoring, Connection Monitoring, General Message)
+- Part 4 (Functional Service Interfaces: Facility Monitoring)
+- Part 5 (Functional Service Interfaces: Situation Exchange)
+- Part 6 (Functional Service Interfaces: Control Actions)
+
+## Overview
+
+SIRI is a European standard and that enables real-time information about public transportation to be shared between different computer systems. 
+SIRI was established as European standard in October 2006. It is a CEN (Comité Européen de Normalisation) norm and Technical Specification.
+
+## Folder structure 📁
+
+In each branch, we have:
+- The folder `xsd` in which all the XML schemas can be found
+- The folder `examples` in which all examples can be found
+- At the root folder, `Siri.spp` which is the project for XMLSpy and `Siri.xpr` for Oxygen
+
+## Branches  🌿
+|**Branch**|**Description**|**Link**|
+|----------|---------------|--------|
+|master|The latest version of the XML Schema that matches the CEN documentation|[Direct link](https://github.com/SIRI-CEN/SIRI)|
+|integration|All the upcoming work that goes with the revision of SIRI, matching the next round of CEN documentation|[Direct link](https://github.com/SIRI-CEN/SIRI/tree/integration)|
+
+## How to contribute
+
+When you want to suggest a change to SIRI XSD, please target:
+- Master for any bug fixes or typos
+- Integration for any functional changes