From 0c7120bd02f94775a2616f1b6de832ca88a9eaa6 Mon Sep 17 00:00:00 2001 From: Dennis Date: Sat, 29 Apr 2023 14:56:04 +0200 Subject: [PATCH 1/2] Replace FreeBSD llvm90 package I don't have FreeBSD so I don't know what I'm doing, hopefully the CI gives accurate feedback --- .github/workflows/build_release_template.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_release_template.yml b/.github/workflows/build_release_template.yml index 8fc3dcb6..845b2f1a 100644 --- a/.github/workflows/build_release_template.yml +++ b/.github/workflows/build_release_template.yml @@ -271,7 +271,7 @@ jobs: usesh: true # Need more RAM than the default 1G mem: 4096 - prepare: pkg install -y bash curl curlpp git gmake pkgconf gnupg rsync llvm90 + prepare: pkg install -y bash curl curlpp git gmake pkgconf gnupg rsync llvm run: | set -eux From 9e9e4fd7c508d0734b179839e1fe55d77adda0ab Mon Sep 17 00:00:00 2001 From: Dennis Korpel Date: Tue, 2 May 2023 11:49:21 +0200 Subject: [PATCH 2/2] Use ldc package instead of install script --- .github/workflows/build_release_template.yml | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build_release_template.yml b/.github/workflows/build_release_template.yml index 845b2f1a..24ddf164 100644 --- a/.github/workflows/build_release_template.yml +++ b/.github/workflows/build_release_template.yml @@ -271,7 +271,7 @@ 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 @@ -279,22 +279,15 @@ jobs: 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 }} #################################################################