From 3dd2b5b4855b59cf5ba290599f617eb05f664572 Mon Sep 17 00:00:00 2001
From: WebFreak001 <gh@webfreak.org>
Date: Fri, 14 Oct 2022 14:18:45 +0200
Subject: [PATCH] Update GDC to fix CI

---
 .github/workflows/default.yml | 18 +++++++++---------
 makefile                      |  4 +++-
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/default.yml b/.github/workflows/default.yml
index 93ddfe1..510d68c 100644
--- a/.github/workflows/default.yml
+++ b/.github/workflows/default.yml
@@ -30,11 +30,11 @@ jobs:
           {
             # Install dmd for the associated tools (dub/rdmd)
             version: dmd-latest,
-            dmd: gdmd
+            dmd: gdc-12
           }
         ]
         host: [
-          ubuntu-latest,
+          ubuntu-22.04,
           macos-latest,
           windows-latest
         ]
@@ -50,15 +50,15 @@ jobs:
         exclude:
           # Restrict GDC to Ubuntu
           - compiler:
-              dmd: gdmd
+              dmd: gdc-12
             host: windows-latest
           - compiler:
-              dmd: gdmd
+              dmd: gdc-12
             host: macos-latest
 
           #  Omit dub builds for GDC because dub rejects the old fronted revision
           - compiler:
-              dmd: gdmd
+              dmd: gdc-12
             build:
               type: dub
 
@@ -75,17 +75,17 @@ jobs:
       # Install the host compiler (DMD or LDC)
       # Also grabs DMD for GDC to include dub + rdmd
       - 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
         with:
           compiler: ${{ matrix.compiler.version }}
 
         # GDC not yet supported by setup-dlang
       - name: Install GDC via apt-get
-        if: ${{ matrix.compiler.dmd == 'gdmd' }}
+        if: ${{ matrix.compiler.dmd == 'gdc-12' }}
         run: |
-          sudo apt-get install gdc gdmd -y
-          gdc --version
+          sudo apt-get install gdc-12 -y
+          gdc-12 --version
 
       # Compile D-Scanner and execute all tests without dub
       - name: Build and test without dub
diff --git a/makefile b/makefile
index 24e5c6a..58fd93a 100644
--- a/makefile
+++ b/makefile
@@ -54,7 +54,9 @@ GDC_DEBUG_VERSIONS = -fversion=dparse_verbose
 DC_FLAGS += -Jbin
 override DMD_FLAGS += $(DFLAGS) -w -release -O -od${OBJ_DIR}
 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
 override DMD_TEST_FLAGS += -w