Skip to content

Commit 0b96ed1

Browse files
authored
Merge pull request #240 from dlang/fix-dmd-master
Fix tests on DMD master
2 parents 7bc10ff + 0b957da commit 0b96ed1

File tree

88 files changed

+275
-327
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+275
-327
lines changed

.github/workflows/ci.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ jobs:
1616
fail-fast: false
1717
matrix:
1818
os: [ubuntu-latest]
19-
dc: [dmd-latest, ldc-latest]
19+
dc: [dmd-latest, ldc-latest, dmd-master]
2020
arch: [x86, x86_64]
2121

2222
runs-on: ${{ matrix.os }}
2323
steps:
24-
- uses: actions/checkout@v2
24+
- uses: actions/checkout@v4
2525

2626
- name: Install D compiler
27-
uses: dlang-community/setup-dlang@v1
27+
uses: dlang-community/setup-dlang@v2
2828
with:
2929
compiler: ${{ matrix.dc }}
3030

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

3939
- name: Upload PhantomCSS failures
40-
uses: actions/upload-artifact@v3
40+
uses: actions/upload-artifact@v4
4141
if: always()
4242
with:
4343
name: phantomcss-failures
44+
overwrite: true
4445
path: |
4546
test/screenshots/*.diff.png
4647
test/screenshots/*.fail.png

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
.dub
22
/ddox
33
/__*
4+
/libddox.a
5+
/ddox.dll
46
node_modules
57
ddox-test-library
68
test/screenshots/*.diff.png
@@ -9,3 +11,4 @@ tests/*/test.json
911
tests/*/__dummy.html
1012
tests/*/docs/file_hashes.json
1113
tests/timestamp/docs/
14+
__dummy_html

.travis.yml

Lines changed: 0 additions & 9 deletions
This file was deleted.

dub.sdl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ description "Powerful alternative to DMD's DDOC engine."
33
authors "Sönke Ludwig"
44
license "MIT"
55

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

1010
configuration "application" {
1111
targetType "executable"

dub.selections.json

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,26 @@
33
"versions": {
44
"botan": "1.12.19",
55
"botan-math": "1.0.3",
6-
"diet-ng": "1.8.1",
7-
"eventcore": "0.9.28",
6+
"diet-ng": "1.8.4",
7+
"during": "0.3.0",
8+
"eventcore": "0.9.38",
89
"hyphenate": "1.1.4",
910
"libasync": "0.8.6",
10-
"libdparse": "0.15.4",
11+
"libdparse": "0.25.0",
1112
"libevent": "2.0.2+2.0.16",
1213
"memutils": "1.0.10",
13-
"mir-linux-kernel": "1.0.1",
14-
"openssl": "3.3.3",
15-
"openssl-static": "1.0.2+3.0.8",
14+
"mir-linux-kernel": "1.2.1",
15+
"openssl": "3.4.0",
16+
"openssl-static": "1.0.5+3.0.8",
17+
"silly": "1.1.1",
1618
"stdx-allocator": "2.77.5",
17-
"taggedalgebraic": "0.11.22",
18-
"vibe-container": "1.3.0",
19-
"vibe-core": "2.8.2",
20-
"vibe-d": "0.10.0",
21-
"vibe-http": "1.0.0",
22-
"vibe-inet": "1.0.0",
23-
"vibe-serialization": "1.0.1",
24-
"vibe-stream": "1.1.0"
19+
"taggedalgebraic": "1.0.1",
20+
"vibe-container": "1.7.0",
21+
"vibe-core": "2.13.1",
22+
"vibe-d": "0.10.2",
23+
"vibe-http": "1.3.1",
24+
"vibe-inet": "1.2.0",
25+
"vibe-serialization": "1.1.3",
26+
"vibe-stream": "1.3.0"
2527
}
2628
}

tests/issue110_xref_to_package_d/docs/mod.html

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,7 @@
4040
</ul>
4141
</nav>
4242
<div id="main-contents">
43-
<h1>Module mod</h1><p></p>
44-
<section></section>
43+
<h1>Module mod</h1><p></p><section></section>
4544
<footer>
4645
<table class="license-info">
4746
<tr>

tests/issue110_xref_to_package_d/docs/mod/foo.html

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,7 @@
4040
</ul>
4141
</nav>
4242
<div id="main-contents">
43-
<h1>Module mod.foo</h1><p></p>
44-
<section></section>
43+
<h1>Module mod.foo</h1><p></p><section></section>
4544
<footer>
4645
<table class="license-info">
4746
<tr>

tests/issue110_xref_to_package_d/docs/test.html

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,7 @@
4040
</ul>
4141
</nav>
4242
<div id="main-contents">
43-
<h1>Module test</h1><p></p>
44-
<section></section>
43+
<h1>Module test</h1><p></p><section></section>
4544
<section>
4645
<h2>Functions</h2>
4746
<table>

tests/issue110_xref_to_package_d/docs/test/foo.html

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,11 @@ <h1>Function foo</h1><p>Link to <code class="lang-d"><a href="../mod.html"><span
4444
</p>
4545
<div class="prototype">
4646
<code class="lang-d">
47-
<div class="single-prototype">
48-
<span class="typ">void</span> <span class="pln">foo</span><span class="pun">(</span><span class="pun">)</span><span class="pun">;</span>
47+
<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>
4948
</div>
5049
</code>
5150
</div>
5251

53-
5452
<footer>
5553
<table class="license-info">
5654
<tr>

tests/issue116_inherit_macros/docs/test.html

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,7 @@
2828
</ul>
2929
</nav>
3030
<div id="main-contents">
31-
<h1>Module test</h1><p></p>
32-
<section></section>
31+
<h1>Module test</h1><p></p><section></section>
3332
<section>
3433
<h2>Functions</h2>
3534
<table>

0 commit comments

Comments
 (0)