Skip to content

Commit 3dd2b5b

Browse files
committed
Update GDC to fix CI
1 parent 2220812 commit 3dd2b5b

File tree

2 files changed

+12
-10
lines changed

2 files changed

+12
-10
lines changed

.github/workflows/default.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ jobs:
3030
{
3131
# Install dmd for the associated tools (dub/rdmd)
3232
version: dmd-latest,
33-
dmd: gdmd
33+
dmd: gdc-12
3434
}
3535
]
3636
host: [
37-
ubuntu-latest,
37+
ubuntu-22.04,
3838
macos-latest,
3939
windows-latest
4040
]
@@ -50,15 +50,15 @@ jobs:
5050
exclude:
5151
# Restrict GDC to Ubuntu
5252
- compiler:
53-
dmd: gdmd
53+
dmd: gdc-12
5454
host: windows-latest
5555
- compiler:
56-
dmd: gdmd
56+
dmd: gdc-12
5757
host: macos-latest
5858

5959
# Omit dub builds for GDC because dub rejects the old fronted revision
6060
- compiler:
61-
dmd: gdmd
61+
dmd: gdc-12
6262
build:
6363
type: dub
6464

@@ -75,17 +75,17 @@ jobs:
7575
# Install the host compiler (DMD or LDC)
7676
# Also grabs DMD for GDC to include dub + rdmd
7777
- name: Install ${{ matrix.compiler.version }}
78-
if: ${{ matrix.compiler.dmd != 'gdmd' || matrix.build.type == 'dub' }} # Fetch required tools for GDC
78+
if: ${{ matrix.compiler.dmd != 'gdc-12' || matrix.build.type == 'dub' }} # Fetch required tools for GDC
7979
uses: dlang-community/setup-dlang@v1
8080
with:
8181
compiler: ${{ matrix.compiler.version }}
8282

8383
# GDC not yet supported by setup-dlang
8484
- name: Install GDC via apt-get
85-
if: ${{ matrix.compiler.dmd == 'gdmd' }}
85+
if: ${{ matrix.compiler.dmd == 'gdc-12' }}
8686
run: |
87-
sudo apt-get install gdc gdmd -y
88-
gdc --version
87+
sudo apt-get install gdc-12 -y
88+
gdc-12 --version
8989
9090
# Compile D-Scanner and execute all tests without dub
9191
- name: Build and test without dub

makefile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,9 @@ GDC_DEBUG_VERSIONS = -fversion=dparse_verbose
5454
DC_FLAGS += -Jbin
5555
override DMD_FLAGS += $(DFLAGS) -w -release -O -od${OBJ_DIR}
5656
override LDC_FLAGS += $(DFLAGS) -O5 -release -oq
57-
override GDC_FLAGS += $(DFLAGS) -O3 -frelease
57+
override GDC_FLAGS += $(DFLAGS) -O3 -frelease -fall-instantiations
58+
59+
override GDC_TEST_FLAGS += -fall-instantiations
5860

5961
DC_TEST_FLAGS += -g -Jbin
6062
override DMD_TEST_FLAGS += -w

0 commit comments

Comments
 (0)