Skip to content

Commit a51dd50

Browse files
committed
[ci] improve xqts workflow
- if only one XQTS run on develop was retained the jq script returned null - the command line invocations were hard to read and are now split into multiple lines - temporary files have file endings according to their contents and more meaningful names - the names of the steps try to be as brief and clear as possible
1 parent 87b766e commit a51dd50

File tree

1 file changed

+30
-9
lines changed

1 file changed

+30
-9
lines changed

.github/workflows/ci-xqts.yml

Lines changed: 30 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -49,17 +49,38 @@ jobs:
4949
name: xqts-logs
5050
retention-days: 14
5151
path: /tmp/xqts-output
52-
- name: Get Previous XQTS Logs Artifacts JSON
53-
run: 'curl -H "Accept: application/vnd.github+json" -H "X-GitHub-Api-Version: 2022-11-28" https://api.github.com/repos/exist-db/exist/actions/artifacts?name=xqts-logs > /tmp/previous-xqts-logs-artifacts.json'
54-
- name: Extract Previous XQTS Logs Artifact JSON
55-
run: cat /tmp/previous-xqts-logs-artifacts.json | jq -r "[.artifacts[] | select(.workflow_run.head_branch == \"develop\")][1].archive_download_url" > /tmp/previous-xqts-logs-artifact.json
56-
- name: Get Previous XQTS Logs Artifact
52+
- name: Get List of Previous XQTS Logs
53+
run: |
54+
curl \
55+
-H "Accept: application/vnd.github+json" \
56+
-H "X-GitHub-Api-Version: 2022-11-28" \
57+
https://api.github.com/repos/exist-db/exist/actions/artifacts?name=xqts-logs \
58+
> /tmp/artifacts-list.json
59+
- name: Get Download URL of Latest Run on Develop
60+
run: |
61+
cat /tmp/artifacts-list.json | \
62+
jq -r '[.artifacts[] | select(.workflow_run.head_branch == "develop")][0].archive_download_url' \
63+
> /tmp/download_url.txt
64+
- name: Download XQTS Logs Archive
5765
env:
5866
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
59-
run: 'cat /tmp/previous-xqts-logs-artifact.json | xargs curl -H "Authorization: Bearer ${GITHUB_TOKEN}" --location --output /tmp/previous-xqts-output.zip'
60-
- name: Extract Previous XQTS Logs Artifact
61-
run: mkdir /tmp/previous-xqts-output && unzip /tmp/previous-xqts-output.zip -d /tmp/previous-xqts-output
67+
run: |
68+
cat /tmp/download_url.txt | \
69+
xargs curl -H "Authorization: Bearer ${GITHUB_TOKEN}" \
70+
--location \
71+
--output /tmp/previous-xqts-output.zip
72+
- name: Extract XQTS Logs Archive
73+
run: |
74+
mkdir /tmp/previous-xqts-output && \
75+
unzip /tmp/previous-xqts-output.zip -d /tmp/previous-xqts-output
6276
- name: Compare Previous and Current XQTS Logs
63-
run: java -jar ~/.m2/repository/net/sf/saxon/Saxon-HE/9.9.1-8/Saxon-HE-9.9.1-8.jar -xsl:exist-xqts/src/main/xslt/compare-results.xslt -it:compare-results -o:/tmp/comparison-results.xml xqts.previous.junit-data-path=/tmp/previous-xqts-output/junit/data xqts.current.junit-data-path=/tmp/xqts-output/junit/data
77+
run: |
78+
java \
79+
-jar ~/.m2/repository/net/sf/saxon/Saxon-HE/9.9.1-8/Saxon-HE-9.9.1-8.jar \
80+
-xsl:exist-xqts/src/main/xslt/compare-results.xslt \
81+
-it:compare-results \
82+
-o:/tmp/comparison-results.xml \
83+
xqts.previous.junit-data-path=/tmp/previous-xqts-output/junit/data \
84+
xqts.current.junit-data-path=/tmp/xqts-output/junit/data
6485
- name: Show Comparison Results
6586
run: cat /tmp/comparison-results.xml

0 commit comments

Comments
 (0)