Skip to content

Commit 6a01124

Browse files
committed
ci: Upgrade tested CI to the latest Ubuntu (20 -> 24)
1 parent 6dc032d commit 6a01124

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ jobs:
88
setup-ebtree:
99
uses: ./.github/workflows/ebtree.yml
1010
with:
11-
os: ubuntu-20.04
11+
os: ubuntu-24.04
1212

1313
test:
1414
strategy:
1515
# Disable `fail-fast` because even if things fail for one compiler release
1616
# or build flavour we still want to see how things perform with the others
1717
fail-fast: false
1818
matrix:
19-
os: [ ubuntu-20.04 ]
19+
os: [ ubuntu-24.04 ]
2020
dc: [ dmd-2.092.1, dmd-2.093.1 ]
2121
flavor: [ prod, devel ]
2222
include:
@@ -43,7 +43,7 @@ jobs:
4343
- name: Install dependencies
4444
run: |
4545
sudo apt-get update
46-
sudo apt-get install -y libxslt-dev liblzo2-dev libgcrypt-dev libgpg-error-dev
46+
sudo apt-get install -y libbz2-dev libglib2.0-dev libreadline-dev libxslt-dev liblzo2-dev libgcrypt-dev libgpg-error-dev
4747
sudo dpkg -i ${{ github.workspace }}/tools/ebtree/deb/libebtree6*.deb
4848
4949
- name: Install compiler

Build.mak

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,12 @@ ifneq ($(ALLOW_DEPRECATIONS),1)
1616
override DFLAGS += -de
1717
endif
1818

19-
# Enables https://github.com/sociomantic-tsunami/ocean/blob/v6.x.x/src/ocean/net/ssl/openssl/OpenSsl.d#L529
20-
ifeq ($(OPENSSL_V3),1)
19+
# Default to OpenSSL 3 unless otherwise specified
20+
ifneq ($(OPENSSL_VERSION_STRING),)
21+
override DFLAGS += -version=$(OPENSSL_VERSION_STRING)
22+
else
2123
override DFLAGS += -version=DeimosOpenSSL_3_0
22-
endif
24+
endif
2325

2426
# Remove coverage files
2527
clean += .*.lst

0 commit comments

Comments
 (0)