Skip to content
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.

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

ci: Bump setup-dlang #2912

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Install latest DMD
uses: dlang-community/setup-dlang@v1
uses: dlang-community/setup-dlang@v2
- name: Checkout
uses: actions/checkout@v4
- name: Run tests
Expand Down Expand Up @@ -89,7 +89,7 @@ jobs:

# Compiler to test with
- name: Prepare compiler
uses: dlang-community/setup-dlang@v1
uses: dlang-community/setup-dlang@v2
with:
compiler: ${{ matrix.dc }}

Expand All @@ -113,10 +113,10 @@ jobs:
env:
DUB: ${{ github.workspace }}\bin\dub.exe
run: |
dub build --compiler=${{ env.DC }}
dub build --compiler="${{ env.DC }}"
if [[ ${{ matrix.do_test }} == 'true' ]]; then
dub test --compiler=${{ env.DC }}
dub run --compiler=${{ env.DC }} --single test/issue2051_running_unittests_from_dub_single_file_packages_fails.d
dub test --compiler="${{ env.DC }}"
dub run --compiler="${{ env.DC }}" --single test/issue2051_running_unittests_from_dub_single_file_packages_fails.d
dub --single test/run-unittest.d

# FIXME: DMD fails a few tests on Windows; remove them for now
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr_info_untrusted.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:

# Compiler to test with
- name: Prepare compiler
uses: dlang-community/setup-dlang@v1
uses: dlang-community/setup-dlang@v2
with:
compiler: ldc-latest

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:

## Boileterplate (compiler/repo)
- name: Install compiler
uses: dlang-community/setup-dlang@v1
uses: dlang-community/setup-dlang@v2
with:
compiler: ldc-latest
- name: Checkout repository
Expand Down
5 changes: 4 additions & 1 deletion test/issue2012-dc-env/app.d
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
+/

import std.format;
import std.path : baseName;
import std.algorithm : canFind;

void main(string[] args)
{
Expand All @@ -14,5 +16,6 @@ void main(string[] args)
version (GNU)
immutable expected = "gdc";

assert(expected == args[1], format!"Expected '%s' but got '%s'"(expected, args[1]));
assert(args[1].baseName.canFind(expected),
format!"Expected '%s' but got '%s'"(expected, args[1]));
}
Loading