Skip to content

Commit 9e9e4fd

Browse files
committed
Use ldc package instead of install script
1 parent 0c7120b commit 9e9e4fd

File tree

1 file changed

+3
-10
lines changed

1 file changed

+3
-10
lines changed

.github/workflows/build_release_template.yml

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -271,30 +271,23 @@ jobs:
271271
usesh: true
272272
# Need more RAM than the default 1G
273273
mem: 4096
274-
prepare: pkg install -y bash curl curlpp git gmake pkgconf gnupg rsync llvm
274+
prepare: pkg install -y bash curl curlpp git gmake pkgconf gnupg rsync ldc
275275
run: |
276276
set -eux
277277
278278
# Import key used to sign binaries
279279
curl https://dlang.org/d-keyring.gpg -o d-keyring.gpg
280280
gpg d-keyring.gpg
281281
282-
# Install ldc
283-
curl https://dlang.org/install.sh -o install.sh
284-
bash install.sh ldc -p .
285-
286-
# Use absolute paths because activate doesn't work correctly
287-
LDC_BIN=$PWD/ldc-*/bin
288-
289282
# Determine installed LDC version
290-
LDC=$($LDC_BIN/ldc2 --version | head -n 1 | cut -d'(' -f2 | cut -d')' -f1)
283+
LDC=$(ldc2 --version | head -n 1 | cut -d'(' -f2 | cut -d')' -f1)
291284
292285
# Determine additional linker flags to make -lcurl work
293286
EXTRA_FLAGS="-L$(pkg-config --libs-only-L libcurl)"
294287
295288
# Actually build the release
296289
cd create_dmd_release
297-
$LDC_BIN/ldmd2 -g -m64 --link-defaultlib-debug -version=NoVagrant -i build_all.d $EXTRA_FLAGS
290+
ldmd2 -g -m64 --link-defaultlib-debug -version=NoVagrant -i build_all.d $EXTRA_FLAGS
298291
./build_all --targets=${{ matrix.target }} "v$LDC" ${{ inputs.release_branch }}
299292
300293
#################################################################

0 commit comments

Comments
 (0)