Skip to content

Fix tests on DMD master #240

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.

Sign up for GitHub

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

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
+273 −327
Open

Fix tests on DMD master #240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
97e315f
Test on DMD master.
s-ludwig Apr 18, 2023
b07fd08
Upgrade dependencies.
s-ludwig Mar 2, 2024
dbc374a
Update GitHub actions.
s-ludwig Sep 20, 2025
e9fc88f
Ignore files left over from the CI script.
s-ludwig Oct 15, 2025
76b4475
Adjust reference doc output for changed whitespace in pretty HTML out…
s-ludwig Oct 15, 2025
72a51d5
Add two missing reference HTML files.
s-ludwig Oct 15, 2025
2109cc3
Remove unused TravisCI recipe.
s-ludwig Oct 15, 2025
6ab4f63
Attempt to silence artifact upload errors.
s-ludwig Oct 15, 2025
74db092
Upgrade to latest libdparse.
s-ludwig Oct 15, 2025
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
9 changes: 5 additions & 4 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest]
dc: [dmd-latest, ldc-latest]
dc: [dmd-latest, ldc-latest, dmd-master]
arch: [x86, x86_64]

runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Install D compiler
uses: dlang-community/setup-dlang@v1
uses: dlang-community/setup-dlang@v2
with:
compiler: ${{ matrix.dc }}

Expand All @@ -37,10 +37,11 @@ jobs:
run: DC= ./travis-ci.sh

- name: Upload PhantomCSS failures
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: always()
with:
name: phantomcss-failures
overwrite: true
path: |
test/screenshots/*.diff.png
test/screenshots/*.fail.png
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
.dub
/ddox
/__*
/libddox.a
/ddox.dll
node_modules
ddox-test-library
test/screenshots/*.diff.png
Expand All @@ -9,3 +11,4 @@ tests/*/test.json
tests/*/__dummy.html
tests/*/docs/file_hashes.json
tests/timestamp/docs/
__dummy_html
9 changes: 0 additions & 9 deletions .travis.yml
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions dub.sdl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ description "Powerful alternative to DMD's DDOC engine."
authors "Sönke Ludwig"
license "MIT"

dependency "vibe-d:web" version=">=0.8.0 <0.11.0-0"
dependency "vibe-d:web" version=">=0.9.8 <0.11.0-0"
dependency "hyphenate" version="~>1.1.0"
dependency "libdparse" version="~>0.15.4"
dependency "libdparse" version="~>0.25.0"

configuration "application" {
targetType "executable"
Expand Down
30 changes: 16 additions & 14 deletions dub.selections.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,26 @@
"versions": {
"botan": "1.12.19",
"botan-math": "1.0.3",
"diet-ng": "1.8.1",
"eventcore": "0.9.28",
"diet-ng": "1.8.4",
"during": "0.3.0",
"eventcore": "0.9.38",
"hyphenate": "1.1.4",
"libasync": "0.8.6",
"libdparse": "0.15.4",
"libdparse": "0.25.0",
"libevent": "2.0.2+2.0.16",
"memutils": "1.0.10",
"mir-linux-kernel": "1.0.1",
"openssl": "3.3.3",
"openssl-static": "1.0.2+3.0.8",
"mir-linux-kernel": "1.2.1",
"openssl": "3.4.0",
"openssl-static": "1.0.5+3.0.8",
"silly": "1.1.1",
"stdx-allocator": "2.77.5",
"taggedalgebraic": "0.11.22",
"vibe-container": "1.3.0",
"vibe-core": "2.8.2",
"vibe-d": "0.10.0",
"vibe-http": "1.0.0",
"vibe-inet": "1.0.0",
"vibe-serialization": "1.0.1",
"vibe-stream": "1.1.0"
"taggedalgebraic": "1.0.1",
"vibe-container": "1.7.0",
"vibe-core": "2.13.1",
"vibe-d": "0.10.2",
"vibe-http": "1.3.1",
"vibe-inet": "1.2.0",
"vibe-serialization": "1.1.3",
"vibe-stream": "1.3.0"
}
}
3 changes: 1 addition & 2 deletions tests/issue110_xref_to_package_d/docs/mod.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,7 @@
</ul>
</nav>
<div id="main-contents">
<h1>Module mod</h1><p></p>
<section></section>
<h1>Module mod</h1><p></p><section></section>
<footer>
<table class="license-info">
<tr>
Expand Down
3 changes: 1 addition & 2 deletions tests/issue110_xref_to_package_d/docs/mod/foo.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,7 @@
</ul>
</nav>
<div id="main-contents">
<h1>Module mod.foo</h1><p></p>
<section></section>
<h1>Module mod.foo</h1><p></p><section></section>
<footer>
<table class="license-info">
<tr>
Expand Down
3 changes: 1 addition & 2 deletions tests/issue110_xref_to_package_d/docs/test.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,7 @@
</ul>
</nav>
<div id="main-contents">
<h1>Module test</h1><p></p>
<section></section>
<h1>Module test</h1><p></p><section></section>
<section>
<h2>Functions</h2>
<table>
Expand Down
4 changes: 1 addition & 3 deletions tests/issue110_xref_to_package_d/docs/test/foo.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,11 @@ <h1>Function foo</h1><p>Link to <code class="lang-d"><a href="../mod.html"><span
</p>
<div class="prototype">
<code class="lang-d">
<div class="single-prototype">
<span class="typ">void</span> <span class="pln">foo</span><span class="pun">(</span><span class="pun">)</span><span class="pun">;</span>
<div class="single-prototype"><span class="typ">void</span> <span class="pln">foo</span><span class="pun">(</span><span class="pun">)</span><span class="pun">;</span>
</div>
</code>
</div>


<footer>
<table class="license-info">
<tr>
Expand Down
3 changes: 1 addition & 2 deletions tests/issue116_inherit_macros/docs/test.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,7 @@
</ul>
</nav>
<div id="main-contents">
<h1>Module test</h1><p></p>
<section></section>
<h1>Module test</h1><p></p><section></section>
<section>
<h2>Functions</h2>
<table>
Expand Down
4 changes: 1 addition & 3 deletions tests/issue116_inherit_macros/docs/test/S.g.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,11 @@ <h1>Function S.g</h1><p>module macro struct macro
</p>
<div class="prototype">
<code class="lang-d">
<div class="single-prototype">
<span class="typ">void</span> <span class="pln">g</span><span class="pun">(</span><span class="pun">)</span><span class="pun">;</span>
<div class="single-prototype"><span class="typ">void</span> <span class="pln">g</span><span class="pun">(</span><span class="pun">)</span><span class="pun">;</span>
</div>
</code>
</div>


<footer>
<table class="license-info">
<tr>
Expand Down
4 changes: 1 addition & 3 deletions tests/issue116_inherit_macros/docs/test/S.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,7 @@ <h1>Struct S</h1><p></p>
<div class="prototype">
<code class="lang-d">
<div class="single-prototype">
<span class="kwd">struct</span> <span class="typ">S</span>
<span class="pun">;</span>
<span class="kwd">struct</span> <span class="typ">S</span><span class="pun">;</span>
</div>
</code>
</div>
Expand All @@ -56,7 +55,6 @@ <h1>Struct S</h1><p></p>
</tr>
</table>
</section>

<footer>
<table class="license-info">
<tr>
Expand Down
4 changes: 1 addition & 3 deletions tests/issue116_inherit_macros/docs/test/f.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,11 @@ <h1>Function f</h1><p>module macro
</p>
<div class="prototype">
<code class="lang-d">
<div class="single-prototype">
<span class="typ">void</span> <span class="pln">f</span><span class="pun">(</span><span class="pun">)</span><span class="pun">;</span>
<div class="single-prototype"><span class="typ">void</span> <span class="pln">f</span><span class="pun">(</span><span class="pun">)</span><span class="pun">;</span>
</div>
</code>
</div>


<footer>
<table class="license-info">
<tr>
Expand Down
3 changes: 1 addition & 2 deletions tests/issue151_derived/docs/test.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,7 @@
</ul>
</nav>
<div id="main-contents">
<h1>Module test</h1><p></p>
<section></section>
<h1>Module test</h1><p></p><section></section>
<section>
<h2>Interfaces</h2>
<table>
Expand Down
4 changes: 1 addition & 3 deletions tests/issue151_derived/docs/test/CBase.func.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,11 @@
<h1>Function CBase.func</h1><p></p>
<div class="prototype">
<code class="lang-d">
<div class="single-prototype">
<span class="typ">void</span> <span class="pln">func</span><span class="pun">(</span><span class="pun">)</span><span class="pun">;</span>
<div class="single-prototype"><span class="typ">void</span> <span class="pln">func</span><span class="pun">(</span><span class="pun">)</span><span class="pun">;</span>
</div>
</code>
</div>


<footer>
<table class="license-info">
<tr>
Expand Down
4 changes: 1 addition & 3 deletions tests/issue151_derived/docs/test/CBase.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,7 @@ <h1>Class CBase</h1><p>CBase
<div class="prototype">
<code class="lang-d">
<div class="single-prototype">
<span class="kwd">class</span> <span class="typ">CBase</span>(T)
<span class="pun">;</span>
<span class="kwd">class</span> <span class="typ">CBase</span>(T)<span class="pun">;</span>
</div>
</code>
</div>
Expand All @@ -56,7 +55,6 @@ <h1>Class CBase</h1><p>CBase
</tr>
</table>
</section>

<footer>
<table class="license-info">
<tr>
Expand Down
4 changes: 1 addition & 3 deletions tests/issue151_derived/docs/test/CDerived.func2.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,11 @@
<h1>Function CDerived.func2</h1><p></p>
<div class="prototype">
<code class="lang-d">
<div class="single-prototype">
<span class="typ">void</span> <span class="pln">func2</span><span class="pun">(</span><span class="pun">)</span><span class="pun">;</span>
<div class="single-prototype"><span class="typ">void</span> <span class="pln">func2</span><span class="pun">(</span><span class="pun">)</span><span class="pun">;</span>
</div>
</code>
</div>


<footer>
<table class="license-info">
<tr>
Expand Down
5 changes: 1 addition & 4 deletions tests/issue151_derived/docs/test/CDerived.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,7 @@ <h1>Class CDerived</h1><p>CDerived
<div class="prototype">
<code class="lang-d">
<div class="single-prototype">
<span class="kwd">class</span> <span class="typ">CDerived</span>
<br>&nbsp;&nbsp;: <a href="../test/CBase.html"><span class="typ">CBase</span></a>!int
<span class="pun">;</span>
<span class="kwd">class</span> <span class="typ">CDerived</span><br>&nbsp;&nbsp;: <a href="../test/CBase.html"><span class="typ">CBase</span></a>!int<span class="pun">;</span>
</div>
</code>
</div>
Expand Down Expand Up @@ -66,7 +64,6 @@ <h1>Class CDerived</h1><p>CDerived
</tr>
</table>
</section>

<footer>
<table class="license-info">
<tr>
Expand Down
4 changes: 1 addition & 3 deletions tests/issue151_derived/docs/test/IBase.func.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,11 @@
<h1>Function IBase.func</h1><p></p>
<div class="prototype">
<code class="lang-d">
<div class="single-prototype">
<span class="typ">void</span> <span class="pln">func</span><span class="pun">(</span><span class="pun">)</span><span class="pun">;</span>
<div class="single-prototype"><span class="typ">void</span> <span class="pln">func</span><span class="pun">(</span><span class="pun">)</span><span class="pun">;</span>
</div>
</code>
</div>


<footer>
<table class="license-info">
<tr>
Expand Down
4 changes: 1 addition & 3 deletions tests/issue151_derived/docs/test/IBase.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,7 @@ <h1>Interface IBase</h1><p>IBase
<div class="prototype">
<code class="lang-d">
<div class="single-prototype">
<span class="kwd">interface</span> <span class="typ">IBase</span>(T)
<span class="pun">;</span>
<span class="kwd">interface</span> <span class="typ">IBase</span>(T)<span class="pun">;</span>
</div>
</code>
</div>
Expand All @@ -56,7 +55,6 @@ <h1>Interface IBase</h1><p>IBase
</tr>
</table>
</section>

<footer>
<table class="license-info">
<tr>
Expand Down
4 changes: 1 addition & 3 deletions tests/issue151_derived/docs/test/IDerived.func2.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,11 @@
<h1>Function IDerived.func2</h1><p></p>
<div class="prototype">
<code class="lang-d">
<div class="single-prototype">
<span class="kwd">abstract </span><span class="typ">void</span> <span class="pln">func2</span><span class="pun">(</span><span class="pun">)</span><span class="pun">;</span>
<div class="single-prototype"><span class="kwd">abstract </span><span class="typ">void</span> <span class="pln">func2</span><span class="pun">(</span><span class="pun">)</span><span class="pun">;</span>
</div>
</code>
</div>


<footer>
<table class="license-info">
<tr>
Expand Down
5 changes: 1 addition & 4 deletions tests/issue151_derived/docs/test/IDerived.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,7 @@ <h1>Interface IDerived</h1><p>IDerived
<div class="prototype">
<code class="lang-d">
<div class="single-prototype">
<span class="kwd">interface</span> <span class="typ">IDerived</span>
<br>&nbsp;&nbsp;: <a href="../test/IBase.html"><span class="typ">IBase</span></a>!int
<span class="pun">;</span>
<span class="kwd">interface</span> <span class="typ">IDerived</span><br>&nbsp;&nbsp;: <a href="../test/IBase.html"><span class="typ">IBase</span></a>!int<span class="pun">;</span>
</div>
</code>
</div>
Expand Down Expand Up @@ -66,7 +64,6 @@ <h1>Interface IDerived</h1><p>IDerived
</tr>
</table>
</section>

<footer>
<table class="license-info">
<tr>
Expand Down
3 changes: 1 addition & 2 deletions tests/issue15_templates/docs/test.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,7 @@
</ul>
</nav>
<div id="main-contents">
<h1>Module test</h1><p></p>
<section></section>
<h1>Module test</h1><p></p><section></section>
<section>
<h2>Manifest constants</h2>
<table>
Expand Down
13 changes: 4 additions & 9 deletions tests/issue15_templates/docs/test/isEqual.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,25 +33,20 @@ <h1>Enum member isEqual</h1><p>doc 3
<div class="prototype">
<code class="lang-d">
<div class="single-prototype">
<span class="kwd">enum</span> <span class="pln">isEqual</span>(alias A, alias B)
<span class="pun">=</span> <span class="pln">A </span><span class="pun">== </span><span class="pln">B</span><span class="pun">;</span>
<span class="kwd">enum</span> <span class="pln">isEqual</span>(alias A, alias B) <span class="pun">=</span> <span class="pln">A </span><span class="pun">== </span><span class="pln">B</span><span class="pun">;</span>
</div>
<div class="single-prototype">
<span class="kwd">enum</span> <span class="pln">isEqual</span>(alias A, B)
<span class="pun">=</span> <span class="kwd">false</span><span class="pun">;</span>
<span class="kwd">enum</span> <span class="pln">isEqual</span>(alias A, B) <span class="pun">=</span> <span class="kwd">false</span><span class="pun">;</span>
</div>
<div class="single-prototype">
<span class="kwd">enum</span> <span class="pln">isEqual</span>(A, alias B)
<span class="pun">=</span> <span class="kwd">false</span><span class="pun">;</span>
<span class="kwd">enum</span> <span class="pln">isEqual</span>(A, alias B) <span class="pun">=</span> <span class="kwd">false</span><span class="pun">;</span>
</div>
<div class="single-prototype">
<span class="kwd">enum</span> <span class="pln">isEqual</span>(A, B)
<span class="pun">=</span> <span class="pln">isSameType</span><span class="pun">!(</span><span class="pln">A</span><span class="pun">, </span><span class="pln">B</span><span class="pun">)</span><span class="pun">;</span>
<span class="kwd">enum</span> <span class="pln">isEqual</span>(A, B) <span class="pun">=</span> <span class="pln">isSameType</span><span class="pun">!(</span><span class="pln">A</span><span class="pun">, </span><span class="pln">B</span><span class="pun">)</span><span class="pun">;</span>
</div>
</code>
</div>


<footer>
<table class="license-info">
<tr>
Expand Down
Loading
Loading