Skip to content

Bump dependencies #194

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

Merged
s-ludwig merged 4 commits into from
Jan 25, 2018
Merged

Bump dependencies #194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
223b90d
Bump dependencies
wilzbach Jan 25, 2018
0e56911
Add ddox-test-library to the .gitignore
wilzbach Jan 25, 2018
8030427
Update the testsuite
wilzbach Jan 25, 2018
f43f730
Fix DMD to a specific versions und removed unneeded packages
wilzbach Jan 25, 2018
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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
/ddox
/__*
node_modules
ddox-test-library
test/screenshots/*.diff.png
test/screenshots/*.fail.png
tests/*/test.json
Expand Down
5 changes: 1 addition & 4 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
language: d
services:
- docker
Copy link
Contributor Author

@wilzbach wilzbach Jan 25, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Interesting that Travis is still green without this -> Docker is enabled by default.

d: dmd-2.078.1
Copy link
Contributor Author

@wilzbach wilzbach Jan 25, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To avoid requiring such unrelated changes as below in the future.

addons:
apt:
packages:
- libevent-dev
- libssl-dev
- pkg-config
- zlib1g-dev

script: ./travis-ci.sh
9 changes: 5 additions & 4 deletions dub.selections.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,17 @@
"versions": {
"botan": "1.12.9",
"botan-math": "1.0.3",
"diet-ng": "1.4.3",
"diet-ng": "1.4.4",
"eventcore": "0.8.27",
"hyphenate": "1.1.1",
"libasync": "0.8.3",
"libdparse": "0.7.1",
"libevent": "2.0.2+2.0.16",
"memutils": "0.4.9",
"openssl": "1.1.6+1.0.1g",
"taggedalgebraic": "0.10.8",
"vibe-core": "1.3.0",
"vibe-d": "0.8.2"
"stdx-allocator": "2.77.0",
"taggedalgebraic": "0.10.9",
"vibe-core": "1.4.0-alpha.1",
"vibe-d": "0.8.3-alpha.1"
Copy link
Contributor Author

@wilzbach wilzbach Jan 25, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

0.8.3-alpha.2 fails with:

../../../../vibe/vibe.d-repo/stream/vibe/stream/base64.d(10,8): Error: module stream is in file 'vibe/core/stream.d' which cannot be read
import path[0] = ../../../../vibe/vibe.d-repo/stream
import path[1] = /usr/include/dl

I guess that's an error due to targetType "none" in core/dub.sdl?

Copy link
Member

@s-ludwig s-ludwig Jan 25, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hm, not sure about that, I'll test locally. The same error still happens for vibe-d/vibe.d#2033 on DMD 2.072.x because the latest DUB isn't used anymore.

Copy link
Contributor Author

@wilzbach wilzbach Jan 25, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The error was a regression in master (which is used on Project-Tester), and Martin already submitted a fix: dlang/dub#1350

So I will check whether this is still needed.

DMD 2.072.x because the latest DUB isn't used anymore.

Yeah we should allow opt-in upgrade to the latest DUB version in the installer script.

Copy link
Contributor Author

@wilzbach wilzbach Jan 25, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So the bump is required for another PR too - https://ci.dlang.io/blue/organizations/jenkins/dlang-org%2Fphobos/detail/PR-5921/24/pipeline

diet-ng 1.4.3: building configuration "library"...
vibe-d:utils 0.8.2: building configuration "library"...
../../../../../.dub/packages/vibe-d-0.8.2/vibe-d/utils/vibe/internal/memory_legacy.d(187,37): Error: constructor `vibe.utils.hashmap.HashMap!(void*, ulong, DefaultHashMapTraits!(void*)).HashMap.this(IAllocator allocator)` is not callable using argument types `(RCIAllocator)`
../../../../../.dub/packages/vibe-d-0.8.2/vibe-d/utils/vibe/internal/utilallocator.d(14,85): Error: cannot implicitly convert expression `(*function () => allocatorObject(instance))()` of type `RCIAllocator` to `std.experimental.allocator.IAllocator`
dmd failed with exit code 1.
[ERROR] /var/lib/jenkins/dlang_projects@2/dlang/dub/test/ddox.sh:11 command failed
[ERROR] /var/lib/jenkins/dlang_projects@2/dlang/dub/test/ddox.sh:11 command failed

dlang/phobos#5921

}
}
18 changes: 0 additions & 18 deletions tests/issue15_templates/docs/test.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,24 +30,6 @@
<div id="main-contents">
<h1>Module test</h1><p></p>
<section></section>
<section>
<h2>Templates</h2>
<table>
<col class="caption"/>
<tr>
<th>Name</th><th>Description</th>
</tr>
<tr>
<td>
<code>
<a id="isEqual" class="public" href="./test/isEqual.html">isEqual</a>
</code>
</td>
<td>doc 3
</td>
</tr>
</table>
</section>
<section>
<h2>Manifest constants</h2>
<table>
Expand Down
10 changes: 5 additions & 5 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 @@ -2,7 +2,7 @@
<html>
<head>
<meta charset="UTF-8"/>
<title>Template isEqual</title>
<title>Enum member isEqual</title>
<link rel="stylesheet" type="text/css" href="../styles/ddox.css"/>
<link rel="stylesheet" href="../prettify/prettify.css" type="text/css"/>
<script type="text/javascript" src="../scripts/jquery.js">/**/</script><script type="text/javascript" src="../scripts/ddox.js">/**/</script>
Expand All @@ -28,13 +28,13 @@
</ul>
</nav>
<div id="main-contents">
<h1>Template isEqual</h1><p>doc 3
<h1>Enum member isEqual</h1><p>doc 3
</p>
<div class="prototype">
<code class="lang-d">
<div class="single-prototype">
<span class="kwd">template</span> <span class="pln">isEqual</span>(alias A, alias B)
;
<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)
Expand All @@ -50,7 +50,7 @@ <h1>Template isEqual</h1><p>doc 3
</div>
</code>
</div>
<h2>Template isEqual</h2><h2>Enum member isEqual</h2><h2>Enum member isEqual</h2><h2>Enum member isEqual</h2>


<footer>
<table class="license-info">
Expand Down
6 changes: 3 additions & 3 deletions tests/issue180_return/docs/test/foo.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,23 +35,23 @@ <h1>Function foo</h1><p></p>
<span class="kwd">ref </span><span class="typ">int</span> <span class="pln">foo</span>
<span class="pun">(</span>
<br/>
&nbsp;&nbsp;<span class="kwd">ref </span><span class="typ">int</span> <span class="pln">a</span>
&nbsp;&nbsp;<span class="kwd">ref return </span><span class="typ">int</span> <span class="pln">a</span>
<br/>
<span class="pun">)</span><span class="pln"> </span><span class="kwd">@safe</span><span class="pun">;</span>
<br/>
<br/>
<span class="typ">int</span><span class="pun">*</span> <span class="pln">foo</span>
<span class="pun">(</span>
<br/>
&nbsp;&nbsp;<span class="kwd">scope </span><span class="typ">int</span><span class="pun">*</span> <span class="pln">a</span>
&nbsp;&nbsp;<span class="kwd">scope return </span><span class="typ">int</span><span class="pun">*</span> <span class="pln">a</span>
<br/>
<span class="pun">)</span><span class="pln"> </span><span class="kwd">@safe</span><span class="pun">;</span>
<br/>
<br/>
<span class="kwd">ref </span><span class="typ">int</span><span class="pun">*</span> <span class="pln">foo</span>
<span class="pun">(</span>
<br/>
&nbsp;&nbsp;<span class="kwd">scope ref </span><span class="typ">int</span><span class="pun">*</span> <span class="pln">a</span>
&nbsp;&nbsp;<span class="kwd">scope ref return </span><span class="typ">int</span><span class="pun">*</span> <span class="pln">a</span>
<br/>
<span class="pun">)</span><span class="pln"> </span><span class="kwd">@safe</span><span class="pun">;</span>
</div>
Expand Down