Skip to content
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
8 changes: 5 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
name: CI

on:
# Triggers the workflow on push or pull request events but only for the "master" branch
push:
branches: [ "master", "main", "integration" ]
branches: [ "v[0-9]*" ]
pull_request:
branches: [ "master", "main", "integration" ]
# NB: this is a glob filter, not a regex - `*` matches any chars (except `/`),
# Hence it should match `v2.2`, `v2.3-wip`, etc.
# See https://docs.github.com/en/actions/reference/workflows-and-actions/workflow-syntax#filter-pattern-cheat-sheet
branches: [ "v[0-9]*" ]
Comment thread
haeckerbaer marked this conversation as resolved.
Comment thread
thbar marked this conversation as resolved.

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:
Expand Down
108 changes: 20 additions & 88 deletions docs/generated/contab/acsb.html
Original file line number Diff line number Diff line change
Expand Up @@ -248,11 +248,7 @@ <h3>1.3. The complex type <code>acsb:AccessibilityAssessmentStructure</code>
</td>
<td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
<p class="tableblock">
<<<<<<< HEAD
<em>+<a shape="rect" href="#local-type.typedef-25.1" title="local-type: typedef-25.1">local-type: typedef-25.1</a>
=======
<em>+<a shape="rect" href="#local-type.typedef-47.1" title="local-type: typedef-47.1">local-type: typedef-47.1</a>
>>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
<em>+<a shape="rect" href="#local-type.typedef-15.1" title="local-type: typedef-15.1">local-type: typedef-15.1</a>
</em>
</p>
</td>
Expand All @@ -276,11 +272,7 @@ <h3>1.3. The complex type <code>acsb:AccessibilityAssessmentStructure</code>
</td>
<td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
<p class="tableblock">
<<<<<<< HEAD
<em>+<a shape="rect" href="#local-type.typedef-25.2" title="local-type: typedef-25.2">local-type: typedef-25.2</a>
=======
<em>+<a shape="rect" href="#local-type.typedef-47.2" title="local-type: typedef-47.2">local-type: typedef-47.2</a>
>>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
<em>+<a shape="rect" href="#local-type.typedef-15.2" title="local-type: typedef-15.2">local-type: typedef-15.2</a>
</em>
</p>
</td>
Expand All @@ -305,11 +297,7 @@ <h3>1.3. The complex type <code>acsb:AccessibilityAssessmentStructure</code>
</td>
<td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
<p class="tableblock">
<<<<<<< HEAD
<em>+<a shape="rect" href="#local-type.typedef-8.1" title="local-type: typedef-8.1">local-type: typedef-8.1</a>
=======
<em>+<a shape="rect" href="#local-type.typedef-39.1" title="local-type: typedef-39.1">local-type: typedef-39.1</a>
>>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
<em>+<a shape="rect" href="#local-type.typedef-59.1" title="local-type: typedef-59.1">local-type: typedef-59.1</a>
</em>
</p>
</td>
Expand Down Expand Up @@ -556,11 +544,7 @@ <h3>1.4. The complex type <code>acsb:AccessibilityLimitationStructure</code>
</td>
<td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
<p class="tableblock">
<<<<<<< HEAD
<em>+<a shape="rect" href="#local-type.typedef-8.1" title="local-type: typedef-8.1">local-type: typedef-8.1</a>
=======
<em>+<a shape="rect" href="#local-type.typedef-39.1" title="local-type: typedef-39.1">local-type: typedef-39.1</a>
>>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
<em>+<a shape="rect" href="#local-type.typedef-59.1" title="local-type: typedef-59.1">local-type: typedef-59.1</a>
</em>
</p>
</td>
Expand Down Expand Up @@ -605,13 +589,8 @@ <h3>1.5. The complex type <code>acsb:LimitationRefStructure</code>
</table>
</div>
</div>
<<<<<<< HEAD
<div class="sect2" id="local-type.typedef-25.1">
<h3>1.6. The complex type <code>complexType[acsb:AccessibilityAssessmentStructure]/Limitations#complexType (typedef-25.1)</code>
=======
<div class="sect2" id="local-type.typedef-47.1">
<h3>1.6. The complex type <code>complexType[acsb:AccessibilityAssessmentStructure]/Limitations#complexType (typedef-47.1)</code>
>>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
<div class="sect2" id="local-type.typedef-15.1">
<h3>1.6. The complex type <code>complexType[acsb:AccessibilityAssessmentStructure]/Limitations#complexType (typedef-15.1)</code>
</h3>
<div class="sectionbody">
<table class="tableblock frame-all grid-all spread">
Expand All @@ -631,11 +610,7 @@ <h3>1.6. The complex type <code>complexType[acsb:AccessibilityAssessmentStructur
<br/>
<code>  /Limitations #complexType</code>
<br/>
<<<<<<< HEAD
<code>  (typedef-25.1)</code>
=======
<code>  (typedef-47.1)</code>
>>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
<code>  (typedef-15.1)</code>
</p>
</td>
<td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
Expand Down Expand Up @@ -677,13 +652,8 @@ <h3>1.6. The complex type <code>complexType[acsb:AccessibilityAssessmentStructur
</table>
</div>
</div>
<<<<<<< HEAD
<div class="sect2" id="local-type.typedef-25.2">
<h3>1.7. The complex type <code>complexType[acsb:AccessibilityAssessmentStructure]/Suitabilities#complexType (typedef-25.2)</code>
=======
<div class="sect2" id="local-type.typedef-47.2">
<h3>1.7. The complex type <code>complexType[acsb:AccessibilityAssessmentStructure]/Suitabilities#complexType (typedef-47.2)</code>
>>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
<div class="sect2" id="local-type.typedef-15.2">
<h3>1.7. The complex type <code>complexType[acsb:AccessibilityAssessmentStructure]/Suitabilities#complexType (typedef-15.2)</code>
</h3>
<div class="sectionbody">
<table class="tableblock frame-all grid-all spread">
Expand All @@ -703,11 +673,7 @@ <h3>1.7. The complex type <code>complexType[acsb:AccessibilityAssessmentStructur
<br/>
<code>  /Suitabilities #complexType</code>
<br/>
<<<<<<< HEAD
<code>  (typedef-25.2)</code>
=======
<code>  (typedef-47.2)</code>
>>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
<code>  (typedef-15.2)</code>
</p>
</td>
<td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
Expand Down Expand Up @@ -749,13 +715,8 @@ <h3>1.7. The complex type <code>complexType[acsb:AccessibilityAssessmentStructur
</table>
</div>
</div>
<<<<<<< HEAD
<div class="sect2" id="local-type.typedef-8.1">
<h3>1.8. The complex type <code>element[ifopt:Extensions]#complexType (typedef-8.1)</code>
=======
<div class="sect2" id="local-type.typedef-39.1">
<h3>1.8. The complex type <code>element[ifopt:Extensions]#complexType (typedef-39.1)</code>
>>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
<div class="sect2" id="local-type.typedef-59.1">
<h3>1.8. The complex type <code>element[ifopt:Extensions]#complexType (typedef-59.1)</code>
</h3>
<div class="sectionbody">
<table class="tableblock frame-all grid-all spread">
Expand All @@ -775,11 +736,7 @@ <h3>1.8. The complex type <code>element[ifopt:Extensions]#complexType (typedef-3
<br/>
<code>  #complexType</code>
<br/>
<<<<<<< HEAD
<code>  (typedef-8.1)</code>
=======
<code>  (typedef-39.1)</code>
>>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
<code>  (typedef-59.1)</code>
</p>
</td>
<td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
Expand All @@ -795,13 +752,8 @@ <h3>1.8. The complex type <code>element[ifopt:Extensions]#complexType (typedef-3
</table>
</div>
</div>
<<<<<<< HEAD
<div class="sect2" id="local-type.typedef-8.1">
<h3>1.9. The complex type <code>element[ifopt:Extensions]#complexType (typedef-8.1)</code>
=======
<div class="sect2" id="local-type.typedef-39.1">
<h3>1.9. The complex type <code>element[ifopt:Extensions]#complexType (typedef-39.1)</code>
>>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
<div class="sect2" id="local-type.typedef-59.1">
<h3>1.9. The complex type <code>element[ifopt:Extensions]#complexType (typedef-59.1)</code>
</h3>
<div class="sectionbody">
<table class="tableblock frame-all grid-all spread">
Expand All @@ -821,11 +773,7 @@ <h3>1.9. The complex type <code>element[ifopt:Extensions]#complexType (typedef-3
<br/>
<code>  #complexType</code>
<br/>
<<<<<<< HEAD
<code>  (typedef-8.1)</code>
=======
<code>  (typedef-39.1)</code>
>>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
<code>  (typedef-59.1)</code>
</p>
</td>
<td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
Expand Down Expand Up @@ -1724,20 +1672,12 @@ <h3>3.1. Simple type definitions</h3>
</tr>
<tr>
<td colspan="1" rowspan="2" class="tableblock halign-left valign-top">
<<<<<<< HEAD
<p id="local-type.typedef-27.1" class="tableblock">
=======
<p id="local-type.typedef-48.1" class="tableblock">
>>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
<p id="local-type.typedef-14.1" class="tableblock">
<code>group[acsb:UserNeedGroup]</code>
<br/>
<code>  /MedicalNeed #simpleType</code>
<br/>
<<<<<<< HEAD
<code>  (typedef-27.1)</code>
=======
<code>  (typedef-48.1)</code>
>>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
<code>  (typedef-14.1)</code>
</p>
</td>
<td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
Expand Down Expand Up @@ -1904,11 +1844,7 @@ <h3>3.7. The group <code>acsb:UserNeedGroup</code>
<td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
<p class="tableblock">
<em>
<<<<<<< HEAD
<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>
=======
<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>
>>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
<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>
</em>
</p>
</td>
Expand Down Expand Up @@ -2237,11 +2173,7 @@ <h3>3.10. The complex type <code>acsb:UserNeedStructure</code>
<td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
<p class="tableblock">
<em>
<<<<<<< HEAD
<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>
=======
<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>
>>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
<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>
</em>
</p>
</td>
Expand Down
Loading
Loading