From 126e5e06504fd6e26ef673aa5b2e15fb30a3a064 Mon Sep 17 00:00:00 2001 From: Temtaime Date: Tue, 6 Apr 2021 21:27:49 +0300 Subject: [PATCH] Fix linking on linux --- .github/workflows/ci.yml | 23 +++++++++++++++++++++-- dub.json | 2 +- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 10ac7a2..33cb370 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,27 +14,46 @@ jobs: matrix: include: - arch: x86 - dub_arch: x86 os: windows-latest + dub_arch: x86_mscoff + dub_compiler: ldc-latest - arch: x64 + os: windows-latest + dub_arch: x86_64 + dub_compiler: ldc-latest + + - arch: x64 + os: ubuntu-20.04 dub_arch: x86_64 + dub_compiler: ldc-latest + + - arch: x86 os: windows-latest + dub_arch: x86_mscoff + dub_compiler: dmd-latest - arch: x64 + os: windows-latest dub_arch: x86_64 + dub_compiler: dmd-latest + + - arch: x64 os: ubuntu-20.04 + dub_arch: x86_64 + dub_compiler: dmd-latest runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v2 + - uses: ilammy/msvc-dev-cmd@v1 with: arch: ${{ matrix.arch }} - uses: dlang-community/setup-dlang@v1 with: - compiler: ldc-latest + compiler: ${{ matrix.dub_compiler }} - run: | dub test -b unittest -a ${{ matrix.dub_arch }} diff --git a/dub.json b/dub.json index bf6cd59..d727e1a 100644 --- a/dub.json +++ b/dub.json @@ -11,7 +11,7 @@ "libs-windows-x86_64": [ "$PACKAGE_DIR/bin/stb_x64" ], - "libs-linux": [ + "lflags-linux": [ "$PACKAGE_DIR/bin/libstb.a" ] }