Skip to content

Commit ada377d

Browse files
thbargithub-actions[bot]
thbar
and
github-actions[bot]
authored
Fix out-of-date (wrt XSD) HTML pages (#216)
* Try to avoid out-of-sync/stale HTML pages (wrt XSD) * Attempt to fix "Cannot convert to xs:double: PT0S" (#217) * Fix xcore doc generation crash on BaseX 10.6: handle xs:duration restrictions The addition of `<xsd:minInclusive value="PT0S"/>` on PositiveDurationType (PR #188) introduced a duration value in XSD restrictions that xcore's castToComparable function did not handle. This caused max()/min() to fail with [FORG0006] on BaseX 10.6 (used in CI), as xs:duration is not an ordered type per the XQuery spec (I think). BaseX 12.1+ silently accepts it though (my local runs passed). Cast to xs:dayTimeDuration / xs:yearMonthDuration instead, which are the ordered subtypes that support comparison on all BaseX versions. See #218 * Lint and update documentation tables * Lint and update documentation tables * Make it clearer that the pattern is not a regex * Lint and update documentation tables --------- Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
1 parent ea8080e commit ada377d

11 files changed

Lines changed: 2543 additions & 7682 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
name: CI
22

33
on:
4-
# Triggers the workflow on push or pull request events but only for the "master" branch
54
push:
6-
branches: [ "master", "main", "integration" ]
5+
branches: [ "v[0-9]*" ]
76
pull_request:
8-
branches: [ "master", "main", "integration" ]
7+
# NB: this is a glob filter, not a regex - `*` matches any chars (except `/`),
8+
# Hence it should match `v2.2`, `v2.3-wip`, etc.
9+
# See https://docs.github.com/en/actions/reference/workflows-and-actions/workflow-syntax#filter-pattern-cheat-sheet
10+
branches: [ "v[0-9]*" ]
911

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

‎docs/generated/contab/acsb.html‎

Lines changed: 20 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -248,11 +248,7 @@ <h3>1.3. The complex type <code>acsb:AccessibilityAssessmentStructure</code>
248248
</td>
249249
<td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
250250
<p class="tableblock">
251-
<<<<<<< HEAD
252-
<em>+<a shape="rect" href="#local-type.typedef-25.1" title="local-type: typedef-25.1">local-type: typedef-25.1</a>
253-
=======
254-
<em>+<a shape="rect" href="#local-type.typedef-47.1" title="local-type: typedef-47.1">local-type: typedef-47.1</a>
255-
>>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
251+
<em>+<a shape="rect" href="#local-type.typedef-15.1" title="local-type: typedef-15.1">local-type: typedef-15.1</a>
256252
</em>
257253
</p>
258254
</td>
@@ -276,11 +272,7 @@ <h3>1.3. The complex type <code>acsb:AccessibilityAssessmentStructure</code>
276272
</td>
277273
<td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
278274
<p class="tableblock">
279-
<<<<<<< HEAD
280-
<em>+<a shape="rect" href="#local-type.typedef-25.2" title="local-type: typedef-25.2">local-type: typedef-25.2</a>
281-
=======
282-
<em>+<a shape="rect" href="#local-type.typedef-47.2" title="local-type: typedef-47.2">local-type: typedef-47.2</a>
283-
>>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
275+
<em>+<a shape="rect" href="#local-type.typedef-15.2" title="local-type: typedef-15.2">local-type: typedef-15.2</a>
284276
</em>
285277
</p>
286278
</td>
@@ -305,11 +297,7 @@ <h3>1.3. The complex type <code>acsb:AccessibilityAssessmentStructure</code>
305297
</td>
306298
<td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
307299
<p class="tableblock">
308-
<<<<<<< HEAD
309-
<em>+<a shape="rect" href="#local-type.typedef-8.1" title="local-type: typedef-8.1">local-type: typedef-8.1</a>
310-
=======
311-
<em>+<a shape="rect" href="#local-type.typedef-39.1" title="local-type: typedef-39.1">local-type: typedef-39.1</a>
312-
>>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
300+
<em>+<a shape="rect" href="#local-type.typedef-59.1" title="local-type: typedef-59.1">local-type: typedef-59.1</a>
313301
</em>
314302
</p>
315303
</td>
@@ -556,11 +544,7 @@ <h3>1.4. The complex type <code>acsb:AccessibilityLimitationStructure</code>
556544
</td>
557545
<td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
558546
<p class="tableblock">
559-
<<<<<<< HEAD
560-
<em>+<a shape="rect" href="#local-type.typedef-8.1" title="local-type: typedef-8.1">local-type: typedef-8.1</a>
561-
=======
562-
<em>+<a shape="rect" href="#local-type.typedef-39.1" title="local-type: typedef-39.1">local-type: typedef-39.1</a>
563-
>>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
547+
<em>+<a shape="rect" href="#local-type.typedef-59.1" title="local-type: typedef-59.1">local-type: typedef-59.1</a>
564548
</em>
565549
</p>
566550
</td>
@@ -605,13 +589,8 @@ <h3>1.5. The complex type <code>acsb:LimitationRefStructure</code>
605589
</table>
606590
</div>
607591
</div>
608-
<<<<<<< HEAD
609-
<div class="sect2" id="local-type.typedef-25.1">
610-
<h3>1.6. The complex type <code>complexType[acsb:AccessibilityAssessmentStructure]/Limitations#complexType (typedef-25.1)</code>
611-
=======
612-
<div class="sect2" id="local-type.typedef-47.1">
613-
<h3>1.6. The complex type <code>complexType[acsb:AccessibilityAssessmentStructure]/Limitations#complexType (typedef-47.1)</code>
614-
>>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
592+
<div class="sect2" id="local-type.typedef-15.1">
593+
<h3>1.6. The complex type <code>complexType[acsb:AccessibilityAssessmentStructure]/Limitations#complexType (typedef-15.1)</code>
615594
</h3>
616595
<div class="sectionbody">
617596
<table class="tableblock frame-all grid-all spread">
@@ -631,11 +610,7 @@ <h3>1.6. The complex type <code>complexType[acsb:AccessibilityAssessmentStructur
631610
<br/>
632611
<code>  /Limitations #complexType</code>
633612
<br/>
634-
<<<<<<< HEAD
635-
<code>  (typedef-25.1)</code>
636-
=======
637-
<code>  (typedef-47.1)</code>
638-
>>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
613+
<code>  (typedef-15.1)</code>
639614
</p>
640615
</td>
641616
<td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -677,13 +652,8 @@ <h3>1.6. The complex type <code>complexType[acsb:AccessibilityAssessmentStructur
677652
</table>
678653
</div>
679654
</div>
680-
<<<<<<< HEAD
681-
<div class="sect2" id="local-type.typedef-25.2">
682-
<h3>1.7. The complex type <code>complexType[acsb:AccessibilityAssessmentStructure]/Suitabilities#complexType (typedef-25.2)</code>
683-
=======
684-
<div class="sect2" id="local-type.typedef-47.2">
685-
<h3>1.7. The complex type <code>complexType[acsb:AccessibilityAssessmentStructure]/Suitabilities#complexType (typedef-47.2)</code>
686-
>>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
655+
<div class="sect2" id="local-type.typedef-15.2">
656+
<h3>1.7. The complex type <code>complexType[acsb:AccessibilityAssessmentStructure]/Suitabilities#complexType (typedef-15.2)</code>
687657
</h3>
688658
<div class="sectionbody">
689659
<table class="tableblock frame-all grid-all spread">
@@ -703,11 +673,7 @@ <h3>1.7. The complex type <code>complexType[acsb:AccessibilityAssessmentStructur
703673
<br/>
704674
<code>  /Suitabilities #complexType</code>
705675
<br/>
706-
<<<<<<< HEAD
707-
<code>  (typedef-25.2)</code>
708-
=======
709-
<code>  (typedef-47.2)</code>
710-
>>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
676+
<code>  (typedef-15.2)</code>
711677
</p>
712678
</td>
713679
<td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -749,13 +715,8 @@ <h3>1.7. The complex type <code>complexType[acsb:AccessibilityAssessmentStructur
749715
</table>
750716
</div>
751717
</div>
752-
<<<<<<< HEAD
753-
<div class="sect2" id="local-type.typedef-8.1">
754-
<h3>1.8. The complex type <code>element[ifopt:Extensions]#complexType (typedef-8.1)</code>
755-
=======
756-
<div class="sect2" id="local-type.typedef-39.1">
757-
<h3>1.8. The complex type <code>element[ifopt:Extensions]#complexType (typedef-39.1)</code>
758-
>>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
718+
<div class="sect2" id="local-type.typedef-59.1">
719+
<h3>1.8. The complex type <code>element[ifopt:Extensions]#complexType (typedef-59.1)</code>
759720
</h3>
760721
<div class="sectionbody">
761722
<table class="tableblock frame-all grid-all spread">
@@ -775,11 +736,7 @@ <h3>1.8. The complex type <code>element[ifopt:Extensions]#complexType (typedef-3
775736
<br/>
776737
<code>  #complexType</code>
777738
<br/>
778-
<<<<<<< HEAD
779-
<code>  (typedef-8.1)</code>
780-
=======
781-
<code>  (typedef-39.1)</code>
782-
>>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
739+
<code>  (typedef-59.1)</code>
783740
</p>
784741
</td>
785742
<td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -795,13 +752,8 @@ <h3>1.8. The complex type <code>element[ifopt:Extensions]#complexType (typedef-3
795752
</table>
796753
</div>
797754
</div>
798-
<<<<<<< HEAD
799-
<div class="sect2" id="local-type.typedef-8.1">
800-
<h3>1.9. The complex type <code>element[ifopt:Extensions]#complexType (typedef-8.1)</code>
801-
=======
802-
<div class="sect2" id="local-type.typedef-39.1">
803-
<h3>1.9. The complex type <code>element[ifopt:Extensions]#complexType (typedef-39.1)</code>
804-
>>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
755+
<div class="sect2" id="local-type.typedef-59.1">
756+
<h3>1.9. The complex type <code>element[ifopt:Extensions]#complexType (typedef-59.1)</code>
805757
</h3>
806758
<div class="sectionbody">
807759
<table class="tableblock frame-all grid-all spread">
@@ -821,11 +773,7 @@ <h3>1.9. The complex type <code>element[ifopt:Extensions]#complexType (typedef-3
821773
<br/>
822774
<code>  #complexType</code>
823775
<br/>
824-
<<<<<<< HEAD
825-
<code>  (typedef-8.1)</code>
826-
=======
827-
<code>  (typedef-39.1)</code>
828-
>>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
776+
<code>  (typedef-59.1)</code>
829777
</p>
830778
</td>
831779
<td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -1724,20 +1672,12 @@ <h3>3.1. Simple type definitions</h3>
17241672
</tr>
17251673
<tr>
17261674
<td colspan="1" rowspan="2" class="tableblock halign-left valign-top">
1727-
<<<<<<< HEAD
1728-
<p id="local-type.typedef-27.1" class="tableblock">
1729-
=======
1730-
<p id="local-type.typedef-48.1" class="tableblock">
1731-
>>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
1675+
<p id="local-type.typedef-14.1" class="tableblock">
17321676
<code>group[acsb:UserNeedGroup]</code>
17331677
<br/>
17341678
<code>  /MedicalNeed #simpleType</code>
17351679
<br/>
1736-
<<<<<<< HEAD
1737-
<code>  (typedef-27.1)</code>
1738-
=======
1739-
<code>  (typedef-48.1)</code>
1740-
>>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
1680+
<code>  (typedef-14.1)</code>
17411681
</p>
17421682
</td>
17431683
<td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
@@ -1904,11 +1844,7 @@ <h3>3.7. The group <code>acsb:UserNeedGroup</code>
19041844
<td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
19051845
<p class="tableblock">
19061846
<em>
1907-
<<<<<<< HEAD
1908-
<a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/acsb.enum-dict.html#local-enum.typedef-27.1" title="local-type: typedef-27.1">local-type: typedef-27.1</a>
1909-
=======
1910-
<a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/acsb.enum-dict.html#local-enum.typedef-48.1" title="local-type: typedef-48.1">local-type: typedef-48.1</a>
1911-
>>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
1847+
<a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/acsb.enum-dict.html#local-enum.typedef-14.1" title="local-type: typedef-14.1">local-type: typedef-14.1</a>
19121848
</em>
19131849
</p>
19141850
</td>
@@ -2237,11 +2173,7 @@ <h3>3.10. The complex type <code>acsb:UserNeedStructure</code>
22372173
<td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
22382174
<p class="tableblock">
22392175
<em>
2240-
<<<<<<< HEAD
2241-
<a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/acsb.enum-dict.html#local-enum.typedef-27.1" title="local-type: typedef-27.1">local-type: typedef-27.1</a>
2242-
=======
2243-
<a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/acsb.enum-dict.html#local-enum.typedef-48.1" title="local-type: typedef-48.1">local-type: typedef-48.1</a>
2244-
>>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
2176+
<a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/acsb.enum-dict.html#local-enum.typedef-14.1" title="local-type: typedef-14.1">local-type: typedef-14.1</a>
22452177
</em>
22462178
</p>
22472179
</td>

0 commit comments

Comments
 (0)