Skip to content

Commit 92f20b8

Browse files
committed
Merge remote-tracking branch 'upstream/master' into stable
2 parents d3a900e + 4d4a279 commit 92f20b8

File tree

2 files changed

+402
-33
lines changed

2 files changed

+402
-33
lines changed

.github/workflows/main.yml

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ concurrency:
99

1010
jobs:
1111
main:
12+
defaults:
13+
run:
14+
shell: bash
1215
strategy:
1316
fail-fast: false
1417
matrix:
@@ -18,21 +21,23 @@ jobs:
1821
runs-on: ${{ matrix.os }}
1922
timeout-minutes: 10
2023
env:
21-
DMD: ${{ startsWith(matrix.dc, 'ldc') && 'ldmd2' || 'dmd' }}
2224
N: ${{ startsWith(matrix.os, 'macos') && '3' || '2' }}
2325
steps:
2426
- uses: actions/checkout@v4
2527
- name: Install D compiler
26-
uses: dlang-community/setup-dlang@v1.3.0
28+
uses: dlang-community/setup-dlang@v2
2729
with:
2830
compiler: ${{ matrix.dc }}
31+
# rdmd_test.d needs this
32+
- name: Set DMD to its basename without extension
33+
run: |
34+
val=$(basename "${DMD}")
35+
val=${val%.*}
36+
tee -a ${GITHUB_ENV} <<<"DMD=${val}"
2937
- name: Build
30-
shell: bash
3138
run: make -j$N DMD=$DMD
3239
- name: Test
33-
shell: bash
3440
run: make -j$N DMD=$DMD test
3541
- name: 'Windows: Build and test with MODEL=32'
3642
if: runner.os == 'Windows'
37-
shell: bash
3843
run: make -j$N DMD=$DMD MODEL=32 all test

0 commit comments

Comments
 (0)