Skip to content

Commit

Permalink
ci: Upgrade tested CI to the latest Ubuntu (20 -> 24)
Browse files Browse the repository at this point in the history
  • Loading branch information
Geod24 committed Jan 27, 2025
1 parent 6dc032d commit 20c4712
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 6 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ jobs:
setup-ebtree:
uses: ./.github/workflows/ebtree.yml
with:
os: ubuntu-20.04
os: ubuntu-24.04

test:
strategy:
# Disable `fail-fast` because even if things fail for one compiler release
# or build flavour we still want to see how things perform with the others
fail-fast: false
matrix:
os: [ ubuntu-20.04 ]
os: [ ubuntu-24.04 ]
dc: [ dmd-2.092.1, dmd-2.093.1 ]
flavor: [ prod, devel ]
include:
Expand All @@ -43,7 +43,7 @@ jobs:
- name: Install dependencies
run: |
sudo apt-get update
sudo apt-get install -y libxslt-dev liblzo2-dev libgcrypt-dev libgpg-error-dev
sudo apt-get install -y libbz2-dev libglib2.0-dev libpcre3-dev libreadline-dev libxslt-dev liblzo2-dev libgcrypt-dev libgpg-error-dev
sudo dpkg -i ${{ github.workspace }}/tools/ebtree/deb/libebtree6*.deb
- name: Install compiler
Expand Down
8 changes: 5 additions & 3 deletions Build.mak
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,12 @@ ifneq ($(ALLOW_DEPRECATIONS),1)
override DFLAGS += -de
endif

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

# Remove coverage files
clean += .*.lst
Expand Down

0 comments on commit 20c4712

Please sign in to comment.