forks
/
D-Scanner
mirror of https://github.com/dlang-community/D-Scanner.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update GDC to fix CI

This commit is contained in:
WebFreak001 2022-10-14 14:18:45 +02:00 committed by Jan Jurzitza
parent 2220812b96
commit 3dd2b5b485
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
.github/workflows/default.yml vendored
View File

@ -30,11 +30,11 @@ jobs:
{ {
# Install dmd for the associated tools (dub/rdmd) # Install dmd for the associated tools (dub/rdmd)
version: dmd-latest, version: dmd-latest,
dmd: gdmd dmd: gdc-12
} }
] ]
host: [ host: [
ubuntu-latest, ubuntu-22.04,
macos-latest, macos-latest,
windows-latest windows-latest
] ]
@ -50,15 +50,15 @@ jobs:
exclude: exclude:
# Restrict GDC to Ubuntu # Restrict GDC to Ubuntu
- compiler: - compiler:
dmd: gdmd dmd: gdc-12
host: windows-latest host: windows-latest
- compiler: - compiler:
dmd: gdmd dmd: gdc-12
host: macos-latest host: macos-latest
# Omit dub builds for GDC because dub rejects the old fronted revision # Omit dub builds for GDC because dub rejects the old fronted revision
- compiler: - compiler:
dmd: gdmd dmd: gdc-12
build: build:
type: dub type: dub
@ -75,17 +75,17 @@ jobs:
# Install the host compiler (DMD or LDC) # Install the host compiler (DMD or LDC)
# Also grabs DMD for GDC to include dub + rdmd # Also grabs DMD for GDC to include dub + rdmd
- name: Install ${{ matrix.compiler.version }} - name: Install ${{ matrix.compiler.version }}
if: ${{ matrix.compiler.dmd != 'gdmd' || matrix.build.type == 'dub' }} # Fetch required tools for GDC if: ${{ matrix.compiler.dmd != 'gdc-12' || matrix.build.type == 'dub' }} # Fetch required tools for GDC
uses: dlang-community/setup-dlang@v1 uses: dlang-community/setup-dlang@v1
with: with:
compiler: ${{ matrix.compiler.version }} compiler: ${{ matrix.compiler.version }}
# GDC not yet supported by setup-dlang # GDC not yet supported by setup-dlang
- name: Install GDC via apt-get - name: Install GDC via apt-get
if: ${{ matrix.compiler.dmd == 'gdmd' }} if: ${{ matrix.compiler.dmd == 'gdc-12' }}
run: | run: |
sudo apt-get install gdc gdmd -y sudo apt-get install gdc-12 -y
gdc --version gdc-12 --version
# Compile D-Scanner and execute all tests without dub # Compile D-Scanner and execute all tests without dub
- name: Build and test without dub - name: Build and test without dub

4
makefile
View File

@ -54,7 +54,9 @@ GDC_DEBUG_VERSIONS = -fversion=dparse_verbose
DC_FLAGS += -Jbin DC_FLAGS += -Jbin
override DMD_FLAGS += $(DFLAGS) -w -release -O -od${OBJ_DIR} override DMD_FLAGS += $(DFLAGS) -w -release -O -od${OBJ_DIR}
override LDC_FLAGS += $(DFLAGS) -O5 -release -oq override LDC_FLAGS += $(DFLAGS) -O5 -release -oq
override GDC_FLAGS += $(DFLAGS) -O3 -frelease override GDC_FLAGS += $(DFLAGS) -O3 -frelease -fall-instantiations
override GDC_TEST_FLAGS += -fall-instantiations
DC_TEST_FLAGS += -g -Jbin DC_TEST_FLAGS += -g -Jbin
override DMD_TEST_FLAGS += -w override DMD_TEST_FLAGS += -w