Skip to content

Commit 292de45

Browse files
committed
build everything on Windows
1 parent 41bdd1c commit 292de45

File tree

2 files changed

+33
-23
lines changed

2 files changed

+33
-23
lines changed

.github/workflows/dlang.yml

+19-23
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ name: CI
22

33
on:
44
push:
5-
# branches:
6-
# - master
5+
branches:
6+
- master
77
pull_request:
88
branches:
99
- master
@@ -14,25 +14,25 @@ jobs:
1414
strategy:
1515
fail-fast: false
1616
matrix:
17-
os: [ ubuntu-latest ] # don't bother with windows-latest or macOS-latest
17+
os: [ ubuntu-latest ] # Windows and MacOS are only with latest compilers
1818
compiler:
1919
- dmd-latest
2020
- ldc-latest
21-
# - dmd-2.106.1 # (released in 2024)
22-
# - dmd-2.105.3 # (released in 2023)
23-
# - dmd-2.104.2 # (released in 2023)
24-
# - dmd-2.103.1 # (released in 2023)
25-
# - dmd-2.102.2 # (released in 2023)
26-
# - dmd-2.101.2 # (released in 2023)
27-
# - dmd-2.100.2 # (released in 2022)
28-
# - dmd-2.099.1 # (released in 2022)
29-
# - dmd-2.098.1 # (released in 2021)
30-
# - dmd-2.097.2 # (released in 2021)
31-
# - ldc-1.35.0 # eq to dmd v2.105.2
32-
# - ldc-1.34.0 # eq to dmd v2.104.2
33-
# - ldc-1.33.0 # eq to dmd v2.103.1
34-
# - ldc-1.28.1 # eq to dmd v2.098.1
35-
# - ldc-1.27.1 # eq to dmd v2.097.2
21+
- dmd-2.106.1 # (released in 2024)
22+
- dmd-2.105.3 # (released in 2023)
23+
- dmd-2.104.2 # (released in 2023)
24+
- dmd-2.103.1 # (released in 2023)
25+
- dmd-2.102.2 # (released in 2023)
26+
- dmd-2.101.2 # (released in 2023)
27+
- dmd-2.100.2 # (released in 2022)
28+
- dmd-2.099.1 # (released in 2022)
29+
- dmd-2.098.1 # (released in 2021)
30+
- dmd-2.097.2 # (released in 2021)
31+
- ldc-1.35.0 # eq to dmd v2.105.2
32+
- ldc-1.34.0 # eq to dmd v2.104.2
33+
- ldc-1.33.0 # eq to dmd v2.103.1
34+
- ldc-1.28.1 # eq to dmd v2.098.1
35+
- ldc-1.27.1 # eq to dmd v2.097.2
3636

3737
include:
3838
- { os: windows-latest, compiler: dmd-latest } # Windows Server 2022
@@ -49,14 +49,10 @@ jobs:
4949
with:
5050
compiler: ${{ matrix.compiler }}
5151

52-
# - name: Install dependencies on Mac OSX
53-
# if: startsWith(matrix.os, 'mac')
54-
# run: brew bundle
55-
5652
- name: Build All With make (unix)
5753
if: runner.os != 'Windows'
5854
run: make all
5955

6056
- name: Build All With rdmd (windows)
6157
if: startsWith(matrix.os, 'windows')
62-
run: rdmd Build.d
58+
run: rdmd Build.d all

Build.d

+14
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,14 @@ void build(string dir, string lib)
164164
auto pid = spawnProcess([DC, "@build.rf"]);
165165

166166
if ( wait(pid) != 0 )
167+
{
168+
writefln("%s failed", DC);
167169
exit(1);
170+
}
171+
else
172+
{
173+
writeln("process complete");
174+
}
168175
}
169176

170177
version(LDC)std.file.rmdirRecurse("objects");
@@ -179,7 +186,14 @@ void buildObj(string files, string objName)
179186

180187
auto pid = spawnProcess(["dmd", "@build.rf"]);
181188
if ( wait(pid) != 0 )
189+
{
190+
writeln("dmd failed");
182191
exit(1);
192+
}
193+
else
194+
{
195+
writeln("process complete");
196+
}
183197
}
184198

185199
string dFiles(string sourceDir)

0 commit comments

Comments
 (0)