From bef8a1c8e9f1db726dd70010df5749553c162ef7 Mon Sep 17 00:00:00 2001 From: Martin Kinkelin Date: Wed, 22 Nov 2023 12:42:20 +0100 Subject: [PATCH] GHA: Adapt to recent dmd CI changes --- .github/workflows/main.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index de21335c301..820977b14d9 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -31,11 +31,13 @@ jobs: timeout-minutes: 40 env: # for ci/run.sh: - OS_NAME: ${{ startsWith(matrix.os, 'ubuntu') && 'linux' || (startsWith(matrix.os, 'macos') && 'darwin' || '') }} + OS_NAME: ${{ startsWith(matrix.os, 'ubuntu') && 'linux' || (startsWith(matrix.os, 'macos') && 'osx' || '') }} MODEL: ${{ matrix.model || '64' }} HOST_DMD: dmd N: ${{ startsWith(matrix.os, 'macos') && '3' || '2' }} FULL_BUILD: false + # work around https://issues.dlang.org/show_bug.cgi?id=23517 + MACOSX_DEPLOYMENT_TARGET: '11' steps: - uses: actions/checkout@v4 with: @@ -89,7 +91,7 @@ jobs: with: fetch-depth: 50 - name: Run in VM - uses: cross-platform-actions/action@v0.21.0 + uses: cross-platform-actions/action@v0.21.1 with: operating_system: freebsd hypervisor: qemu