Use ldc package instead of install script

dlang · Jun 11, 2023 · 9e9e4fd · 9e9e4fd
1 parent 0c7120b
commit 9e9e4fd
Showing 1 changed file with 3 additions and 10 deletions.
diff --git a/.github/workflows/build_release_template.yml b/.github/workflows/build_release_template.yml
@@ -271,30 +271,23 @@ jobs:
           usesh: true
           # Need more RAM than the default 1G
           mem: 4096
-          prepare: pkg install -y bash curl curlpp git gmake pkgconf gnupg rsync llvm
+          prepare: pkg install -y bash curl curlpp git gmake pkgconf gnupg rsync ldc
           run: |
             set -eux
 
             # Import key used to sign binaries
             curl https://dlang.org/d-keyring.gpg -o d-keyring.gpg
             gpg d-keyring.gpg
 
-            # Install ldc
-            curl https://dlang.org/install.sh -o install.sh
-            bash install.sh ldc -p .
-
-            # Use absolute paths because activate doesn't work correctly
-            LDC_BIN=$PWD/ldc-*/bin
-
             # Determine installed LDC version
-            LDC=$($LDC_BIN/ldc2 --version | head -n 1 | cut -d'(' -f2 | cut -d')' -f1)
+            LDC=$(ldc2 --version | head -n 1 | cut -d'(' -f2 | cut -d')' -f1)
 
             # Determine additional linker flags to make -lcurl work
             EXTRA_FLAGS="-L$(pkg-config --libs-only-L libcurl)"
 
             # Actually build the release
             cd create_dmd_release
-            $LDC_BIN/ldmd2 -g -m64 --link-defaultlib-debug -version=NoVagrant -i build_all.d $EXTRA_FLAGS
+            ldmd2 -g -m64 --link-defaultlib-debug -version=NoVagrant -i build_all.d $EXTRA_FLAGS
             ./build_all --targets=${{ matrix.target }} "v$LDC" ${{ inputs.release_branch }}
 
       #################################################################