Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Travis to github actions #151

Merged
merged 2 commits into from
Feb 21, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 30 additions & 0 deletions .github/scripts/validate-and-lint.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
#!/bin/bash
# Validate the XML file structure and lint XSD and XML files, e.g. indentation
#
# You need the binary `xmllint`
# apt-get install libxml2-utils

# The -e flag causes the script to exit as soon as one command returns a non-zero exit code
set -e

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
# 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
# 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
PARSING_ERROR=$?
echo -e "\033[0;Validating XML structure of file '${filename}' failed\033[0m"
fi
# Remove temp file
rm "${filename}.pretty"
done < <(/usr/bin/find . -type f \( -name "*.xsd" -or -name "*.xml" \) -not -path "./git" -print0)

if [ ${PARSING_ERROR} -ne 0 ]; then
exit ${PARSING_ERROR}
fi
echo -e '\033[0;32mFinished validating XML file structure and linting XSD and XML files\033[0m'
17 changes: 17 additions & 0 deletions .github/scripts/validate-examples.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
#!/bin/bash
# Validate all SIRI XML examples from the examples/ directory against the SIRI XSD schema
#
# You need the binary `xmllint`
# apt-get install libxml2-utils

# The -e flag causes the script to exit as soon as one command returns a non-zero exit code
set -e

echo "Validating SIRI XML examples ..."

if xmllint --noout --schema xsd/siri.xsd examples/*/*.xml; then
echo -e '\033[0;32mValidating SIRI XML examples succeeded\033[0m'
else
echo -e '\033[0;31mValidating SIRI XML examples failed\033[0m'
exit 1
fi
42 changes: 42 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
name: CI

on:
# Triggers the workflow on push or pull request events but only for the "master" branch
push:
branches: [ "master", "main", "integration" ]
pull_request:
branches: [ "master", "main", "integration" ]

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:

jobs:
run:
runs-on: ubuntu-latest

steps:
- run: echo "Job was automatically triggered by a ${{ github.event_name }} event for branch ${{ github.ref }}"

- name: Check out repository code
uses: actions/checkout@v3
with:
# https://github.com/marketplace/actions/add-commit#working-with-prs
repository: ${{ github.event.pull_request.head.repo.full_name }}
ref: ${{ github.event.pull_request.head.ref }}

- name: Install xmllint and xsltproc
run: |
sudo apt-get update
sudo apt-get install libxml2-utils xsltproc

- name: Validate structure and lint XSD and XML files
run: ./.github/scripts/validate-and-lint.sh

- name: Validate SIRI XML examples
run: ./.github/scripts/validate-examples.sh

- name: Commit changes
uses: EndBug/add-and-commit@v9 # https://github.com/marketplace/actions/add-commit
with:
default_author: github_actions
message: 'Lint and update documentation tables'
10 changes: 0 additions & 10 deletions .travis.yml

This file was deleted.

64 changes: 0 additions & 64 deletions .travis/travis-ci_git-commit.sh

This file was deleted.

4 changes: 0 additions & 4 deletions .travis/xmllint-check.sh

This file was deleted.

10 changes: 5 additions & 5 deletions examples/siri_exa_framework/exa_checkStatus_request.xml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- (C) Copyright 2005-2014 CEN SIRI -->
<Siri xmlns="http://www.siri.org.uk/siri" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.0" xsi:schemaLocation="http://www.siri.org.uk/siri ../../xsd/siri.xsd">
<!-- =======REQUEST================================== -->
<CheckStatusRequest version="2.0">
<RequestTimestamp>2004-12-17T09:30:47-05:00</RequestTimestamp>
<RequestorRef>EREWHON</RequestorRef>
</CheckStatusRequest>
<!-- =======REQUEST================================== -->
<CheckStatusRequest version="2.0">
<RequestTimestamp>2004-12-17T09:30:47-05:00</RequestTimestamp>
<RequestorRef>EREWHON</RequestorRef>
</CheckStatusRequest>
</Siri>
14 changes: 7 additions & 7 deletions examples/siri_exa_framework/exa_checkStatus_response.xml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- (C) Copyright 2005-2014 CEN SIRI -->
<Siri xmlns="http://www.siri.org.uk/siri" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.0" xsi:schemaLocation="http://www.siri.org.uk/siri ../../xsd/siri.xsd">
<CheckStatusResponse>
<ResponseTimestamp>2001-12-17T09:30:47-05:00</ResponseTimestamp>
<Status>true</Status>
<ValidUntil>2004-12-17T19:30:47-05:00</ValidUntil>
<ShortestPossibleCycle>PT2M</ShortestPossibleCycle>
<ServiceStartedTime>2004-12-17T09:30:47-05:00</ServiceStartedTime>
</CheckStatusResponse>
<CheckStatusResponse>
<ResponseTimestamp>2001-12-17T09:30:47-05:00</ResponseTimestamp>
<Status>true</Status>
<ValidUntil>2004-12-17T19:30:47-05:00</ValidUntil>
<ShortestPossibleCycle>PT2M</ShortestPossibleCycle>
<ServiceStartedTime>2004-12-17T09:30:47-05:00</ServiceStartedTime>
</CheckStatusResponse>
</Siri>
8 changes: 4 additions & 4 deletions examples/siri_exa_framework/exa_dataReady_request.xml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- (C) Copyright 2005-2014 CEN SIRI -->
<Siri xmlns="http://www.siri.org.uk/siri" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.0" xsi:schemaLocation="http://www.siri.org.uk/siri ../../xsd/siri.xsd">
<DataReadyNotification>
<RequestTimestamp>2004-12-17T09:30:47-05:00</RequestTimestamp>
<ProducerRef>KUBRICK</ProducerRef>
</DataReadyNotification>
<DataReadyNotification>
<RequestTimestamp>2004-12-17T09:30:47-05:00</RequestTimestamp>
<ProducerRef>KUBRICK</ProducerRef>
</DataReadyNotification>
</Siri>
10 changes: 5 additions & 5 deletions examples/siri_exa_framework/exa_dataReady_response.xml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- (C) Copyright 2005-2014 CEN SIRI -->
<Siri xmlns="http://www.siri.org.uk/siri" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.0" xsi:schemaLocation="http://www.siri.org.uk/siri ../../xsd/siri.xsd">
<DataReadyAcknowledgement>
<ResponseTimestamp>2004-12-17T09:30:47-05:00</ResponseTimestamp>
<ConsumerRef>NADER</ConsumerRef>
<Status>true</Status>
</DataReadyAcknowledgement>
<DataReadyAcknowledgement>
<ResponseTimestamp>2004-12-17T09:30:47-05:00</ResponseTimestamp>
<ConsumerRef>NADER</ConsumerRef>
<Status>true</Status>
</DataReadyAcknowledgement>
</Siri>
12 changes: 6 additions & 6 deletions examples/siri_exa_framework/exa_dataReceived_response.xml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- (C) Copyright 2005-2014 CEN SIRI -->
<Siri xmlns="http://www.siri.org.uk/siri" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.0" xsi:schemaLocation="http://www.siri.org.uk/siri ../../xsd/siri.xsd">
<DataReceivedAcknowledgement>
<ResponseTimestamp>2001-12-17T09:30:47-05:00</ResponseTimestamp>
<ConsumerRef>NADER</ConsumerRef>
<RequestMessageRef>012225678</RequestMessageRef>
<Status>true</Status>
</DataReceivedAcknowledgement>
<DataReceivedAcknowledgement>
<ResponseTimestamp>2001-12-17T09:30:47-05:00</ResponseTimestamp>
<ConsumerRef>NADER</ConsumerRef>
<RequestMessageRef>012225678</RequestMessageRef>
<Status>true</Status>
</DataReceivedAcknowledgement>
</Siri>
12 changes: 6 additions & 6 deletions examples/siri_exa_framework/exa_dataSupply_request.xml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- (C) Copyright 2005-2014 CEN SIRI -->
<Siri xmlns="http://www.siri.org.uk/siri" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.0" xsi:schemaLocation="http://www.siri.org.uk/siri ../../xsd/siri.xsd">
<DataSupplyRequest>
<RequestTimestamp>2004-12-17T09:30:47-05:00</RequestTimestamp>
<ConsumerRef>NADER</ConsumerRef>
<NotificationRef>ABCDE0</NotificationRef>
<AllData>false</AllData>
</DataSupplyRequest>
<DataSupplyRequest>
<RequestTimestamp>2004-12-17T09:30:47-05:00</RequestTimestamp>
<ConsumerRef>NADER</ConsumerRef>
<NotificationRef>ABCDE0</NotificationRef>
<AllData>false</AllData>
</DataSupplyRequest>
</Siri>
16 changes: 8 additions & 8 deletions examples/siri_exa_framework/exa_heartbeat_request.xml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- (C) Copyright 2005-2014 CEN SIRI -->
<Siri xmlns="http://www.siri.org.uk/siri" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.0" xsi:schemaLocation="http://www.siri.org.uk/siri ../../xsd/siri.xsd">
<HeartbeatNotification>
<RequestTimestamp>2004-12-17T09:30:47-05:00</RequestTimestamp>
<ProducerRef>KUBRICK</ProducerRef>
<Status>true</Status>
<ValidUntil>2004-12-17T09:30:47-05:00</ValidUntil>
<ShortestPossibleCycle>P1Y2M3DT10H30M</ShortestPossibleCycle>
<ServiceStartedTime>2004-12-17T09:30:47-05:00</ServiceStartedTime>
</HeartbeatNotification>
<HeartbeatNotification>
<RequestTimestamp>2004-12-17T09:30:47-05:00</RequestTimestamp>
<ProducerRef>KUBRICK</ProducerRef>
<Status>true</Status>
<ValidUntil>2004-12-17T09:30:47-05:00</ValidUntil>
<ShortestPossibleCycle>P1Y2M3DT10H30M</ShortestPossibleCycle>
<ServiceStartedTime>2004-12-17T09:30:47-05:00</ServiceStartedTime>
</HeartbeatNotification>
</Siri>
38 changes: 19 additions & 19 deletions examples/siri_exa_framework/exa_requestSubscription_response.xml
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- (C) Copyright 2005-2014 CEN SIRI -->
<Siri xmlns="http://www.siri.org.uk/siri" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.0" xsi:schemaLocation="http://www.siri.org.uk/siri ../../xsd/siri.xsd">
<SubscriptionResponse>
<ResponseTimestamp>2004-12-17T09:30:47-05:00</ResponseTimestamp>
<ResponderRef>EREWHON</ResponderRef>
<ResponseStatus>
<ResponseTimestamp>2004-12-17T09:30:47-05:01</ResponseTimestamp>
<SubscriptionRef>0003456</SubscriptionRef>
<Status>true</Status>
<ValidUntil>2004-12-17T09:30:47-05:00</ValidUntil>
<ShortestPossibleCycle>P1Y2M3DT10H30M</ShortestPossibleCycle>
</ResponseStatus>
<ResponseStatus>
<ResponseTimestamp>2004-12-17T09:30:47-05:02</ResponseTimestamp>
<SubscriptionRef>0003457</SubscriptionRef>
<Status>false</Status>
<ErrorCondition>
<NoInfoForTopicError/>
</ErrorCondition>
</ResponseStatus>
</SubscriptionResponse>
<SubscriptionResponse>
<ResponseTimestamp>2004-12-17T09:30:47-05:00</ResponseTimestamp>
<ResponderRef>EREWHON</ResponderRef>
<ResponseStatus>
<ResponseTimestamp>2004-12-17T09:30:47-05:01</ResponseTimestamp>
<SubscriptionRef>0003456</SubscriptionRef>
<Status>true</Status>
<ValidUntil>2004-12-17T09:30:47-05:00</ValidUntil>
<ShortestPossibleCycle>P1Y2M3DT10H30M</ShortestPossibleCycle>
</ResponseStatus>
<ResponseStatus>
<ResponseTimestamp>2004-12-17T09:30:47-05:02</ResponseTimestamp>
<SubscriptionRef>0003457</SubscriptionRef>
<Status>false</Status>
<ErrorCondition>
<NoInfoForTopicError/>
</ErrorCondition>
</ResponseStatus>
</SubscriptionResponse>
</Siri>
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- (C) Copyright 2005-2014 CEN SIRI -->
<Siri xmlns="http://www.siri.org.uk/siri" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.0" xsi:schemaLocation="http://www.siri.org.uk/siri ../../xsd/siri.xsd">
<SubscriptionTerminatedNotification>
<ResponseTimestamp>2004-12-17T09:30:47-05:00</ResponseTimestamp>
<ProducerRef>KUBRICK</ProducerRef>
<SubscriberRef>NADER</SubscriberRef>
<SubscriptionRef>987653</SubscriptionRef>
<ErrrorCondition>
<OtherError number="123"/>
<Description>Weekly restart </Description>
</ErrrorCondition>
</SubscriptionTerminatedNotification>
<SubscriptionTerminatedNotification>
<ResponseTimestamp>2004-12-17T09:30:47-05:00</ResponseTimestamp>
<ProducerRef>KUBRICK</ProducerRef>
<SubscriberRef>NADER</SubscriberRef>
<SubscriptionRef>987653</SubscriptionRef>
<ErrrorCondition>
<OtherError number="123"/>
<Description>Weekly restart </Description>
</ErrrorCondition>
</SubscriptionTerminatedNotification>
</Siri>
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- (C) Copyright 2005-2014 CEN SIRI -->
<Siri xmlns="http://www.siri.org.uk/siri" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.0" xsi:schemaLocation="http://www.siri.org.uk/siri ../../xsd/siri.xsd">
<TerminateSubscriptionRequest>
<RequestTimestamp>2004-12-17T09:30:47-05:00</RequestTimestamp>
<RequestorRef>NADER</RequestorRef>
<All/>
</TerminateSubscriptionRequest>
<TerminateSubscriptionRequest>
<RequestTimestamp>2004-12-17T09:30:47-05:00</RequestTimestamp>
<RequestorRef>NADER</RequestorRef>
<All/>
</TerminateSubscriptionRequest>
</Siri>
20 changes: 10 additions & 10 deletions examples/siri_exa_framework/exa_terminateSubscription_response.xml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- (C) Copyright 2005-2012 CEN SIRI -->
<Siri xmlns="http://www.siri.org.uk/siri" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.0" xsi:schemaLocation="http://www.siri.org.uk/siri ../../xsd/siri.xsd">
<TerminateSubscriptionResponse>
<ResponseTimestamp>2004-12-17T09:30:47-05:00</ResponseTimestamp>
<ResponderRef>KUBRICK</ResponderRef>
<TerminationResponseStatus>
<ResponseTimestamp>2004-12-17T09:30:47-05:00</ResponseTimestamp>
<SubscriberRef>NADER</SubscriberRef>
<SubscriptionRef>0000456</SubscriptionRef>
<Status>true</Status>
</TerminationResponseStatus>
</TerminateSubscriptionResponse>
<TerminateSubscriptionResponse>
<ResponseTimestamp>2004-12-17T09:30:47-05:00</ResponseTimestamp>
<ResponderRef>KUBRICK</ResponderRef>
<TerminationResponseStatus>
<ResponseTimestamp>2004-12-17T09:30:47-05:00</ResponseTimestamp>
<SubscriberRef>NADER</SubscriberRef>
<SubscriptionRef>0000456</SubscriptionRef>
<Status>true</Status>
</TerminationResponseStatus>
</TerminateSubscriptionResponse>
</Siri>
Loading