Skip to content

Commit 8e5291d

Browse files
committed
Update supported LDC to v1.23 + v1.22
1 parent 8e06e54 commit 8e5291d

File tree

4 files changed

+60
-19
lines changed

4 files changed

+60
-19
lines changed

.circleci/config.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
command: |
2929
mkdir -p $HOME/dlang && wget https://dlang.org/install.sh -O $HOME/dlang/install.sh
3030
chmod +x $HOME/dlang/install.sh
31-
$HOME/dlang/install.sh install ldc-1.21.0
31+
$HOME/dlang/install.sh install ldc-1.23.0
3232
- run:
3333
name: Install libsodium
3434
command: |
@@ -44,13 +44,13 @@ jobs:
4444
- run:
4545
name: Check virtual method offset
4646
command: |
47-
source $HOME/dlang/ldc-1.21.0/activate
47+
source $HOME/dlang/ldc-1.23.0/activate
4848
ci/check_vtable_test.d
4949
no_output_timeout: 10m
5050
- run:
5151
name: Build & test docker image
5252
command: |
53-
source $HOME/dlang/ldc-1.21.0/activate
53+
source $HOME/dlang/ldc-1.23.0/activate
5454
ci/system_integration_test.d
5555
# Work around druntime setting the permissions to 600..
5656
# Need to iterate on the directory to avoid 'list arguments too long'

.github/workflows/main.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@ jobs:
2222
fail-fast: false
2323
matrix:
2424
os: [ ubuntu-18.04, macOS-10.15, windows-2019 ]
25-
dc: [ ldc-master, ldc-1.22.0, ldc-1.21.0 ]
25+
dc: [ ldc-master, ldc-1.23.0, ldc-1.22.0 ]
2626
# Define job-specific parameters
2727
include:
2828
# By default, don't generate artifacts for push
2929
- { artifacts: false }
30-
# Only generate when `ldc-1.21.0` is used
30+
# Only generate when the latest ldc is used
3131
# IMPORTANT: Update this when the compiler support is changed!
32-
- { dc: ldc-1.22.0, artifacts: true }
32+
- { dc: ldc-1.23.0, artifacts: true }
3333

3434
runs-on: ${{ matrix.os }}
3535
timeout-minutes: 30

.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ language: d
33
dist: xenial
44

55
d:
6-
- ldc-1.22.0,dub
6+
- ldc-1.23.0,dub
77
- ldc-latest-ci # The freshest LDC
88

99
os:

tests/system/dub.json

+53-12
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,59 @@
33
"targetType": "executable",
44
"targetPath": "build",
55
"dflags": [ "-i" ],
6-
"lflags": [ "-lsodium" ],
7-
"importPaths": [
6+
"libs-posix": [ "sodium" ],
7+
"libs-windows": [ "libsodium" ],
8+
"versions":
9+
[
10+
"EventcoreEpollDriver",
11+
"Have_base32",
12+
"Have_bitblob",
13+
"Have_d2sqlite3",
14+
"Have_diet_ng",
15+
"Have_eventcore",
16+
"Have_libsodiumd",
17+
"Have_mir_linux_kernel",
18+
"Have_ocean",
19+
"Have_stdx_allocator",
20+
"Have_systemtest_simple",
21+
"Have_taggedalgebraic",
22+
"Have_vibe_core",
23+
"Have_vibe_d",
24+
"Have_vibe_d_core",
25+
"Have_vibe_d_crypto",
26+
"Have_vibe_d_data",
27+
"Have_vibe_d_http",
28+
"Have_vibe_d_inet",
29+
"Have_vibe_d_mail",
30+
"Have_vibe_d_mongodb",
31+
"Have_vibe_d_redis",
32+
"Have_vibe_d_stream",
33+
"Have_vibe_d_textfilter",
34+
"Have_vibe_d_tls",
35+
"Have_vibe_d_utils",
36+
"Have_vibe_d_web"
37+
],
38+
"importPaths":
39+
[
840
"../../source",
41+
"../../submodules/base32/src",
42+
"../../submodules/bitblob/source",
943
"../../submodules/d2sqlite3/source",
10-
],
11-
12-
"dependencies": {
13-
"base32": { "path": "../../submodules/base32/", "version": "*" },
14-
"bitblob": { "path": "../../submodules/bitblob/", "version": "*" },
15-
"d2sqlite3": { "path": "../../submodules/d2sqlite3/", "version": "*" },
16-
"libsodiumd": { "path": "../../submodules/libsodiumd/", "version": "*" },
17-
"ocean": { "path": "../../submodules/ocean/", "version": "*" },
18-
"vibe-d": { "path": "../../submodules/vibe.d/", "version": "*" }
19-
}
44+
"../../submodules/diet-ng/source",
45+
"../../submodules/eventcore/source",
46+
"../../submodules/libsodiumd/source",
47+
"../../submodules/ocean/src",
48+
"../../submodules/stdx-allocator/source",
49+
"../../submodules/taggedalgebraic/source",
50+
"../../submodules/vibe-core/source",
51+
"../../submodules/vibe.d/crypto",
52+
"../../submodules/vibe.d/data",
53+
"../../submodules/vibe.d/http",
54+
"../../submodules/vibe.d/inet",
55+
"../../submodules/vibe.d/stream",
56+
"../../submodules/vibe.d/textfilter",
57+
"../../submodules/vibe.d/tls",
58+
"../../submodules/vibe.d/utils",
59+
"../../submodules/vibe.d/web"
60+
]
2061
}

0 commit comments

Comments
 (0)