Skip to content

CI: bump setup-dlang to v2 #482

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thewilsonator merged 3 commits into from
Jul 6, 2025
Merged

CI: bump setup-dlang to v2 #482

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c39bd46
rdmd_test.d: Fix test failure
the-horo Jul 6, 2025
b656bd6
CI: refactor shell-bash requirement
the-horo Jul 6, 2025
38ea11e
CI: bump setup-dlang to v2
the-horo Jul 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ concurrency:

jobs:
main:
defaults:
run:
shell: bash
strategy:
fail-fast: false
matrix:
Expand All @@ -18,21 +21,23 @@ jobs:
runs-on: ${{ matrix.os }}
timeout-minutes: 10
env:
DMD: ${{ startsWith(matrix.dc, 'ldc') && 'ldmd2' || 'dmd' }}
N: ${{ startsWith(matrix.os, 'macos') && '3' || '2' }}
steps:
- uses: actions/checkout@v4
- name: Install D compiler
uses: dlang-community/setup-dlang@v1.3.0
uses: dlang-community/setup-dlang@v2
with:
compiler: ${{ matrix.dc }}
# rdmd_test.d needs this
- name: Set DMD to its basename without extension
run: |
val=$(basename "${DMD}")
val=${val%.*}
tee -a ${GITHUB_ENV} <<<"DMD=${val}"
- name: Build
shell: bash
run: make -j$N DMD=$DMD
- name: Test
shell: bash
run: make -j$N DMD=$DMD test
- name: 'Windows: Build and test with MODEL=32'
if: runner.os == 'Windows'
shell: bash
run: make -j$N DMD=$DMD MODEL=32 all test
4 changes: 2 additions & 2 deletions rdmd_test.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,12 +140,12 @@ void runCompilerAgnosticTests(string rdmdApp, string defaultCompiler, string mod
/* Test help string output when no arguments passed. */
auto res = execute([rdmdApp]);
enforce(res.status == 1, res.output);
enforce(res.output.canFind("Usage: rdmd [RDMD AND DMD OPTIONS]... program [PROGRAM OPTIONS]..."));
enforce(res.output.canFind("Usage: rdmd [RDMD AND DMD OPTIONS...] program [PROGRAM OPTIONS...]"));

/* Test --help. */
res = execute([rdmdApp, "--help"]);
enforce(res.status == 0, res.output);
enforce(res.output.canFind("Usage: rdmd [RDMD AND DMD OPTIONS]... program [PROGRAM OPTIONS]..."));
enforce(res.output.canFind("Usage: rdmd [RDMD AND DMD OPTIONS...] program [PROGRAM OPTIONS...]"));

string helpText = res.output;

Expand Down