From 11b978e0a15ed930a0e439490a749a450d0a69cf Mon Sep 17 00:00:00 2001 From: dokutoku <3729541-dokutoku@users.noreply.gitlab.com> Date: Mon, 29 Mar 2021 17:22:51 +0900 Subject: [PATCH] Update .github --- .github/workflows/create-release.yml | 14 ++++++++++---- .github/workflows/cross-compiling.yml | 16 ++++++++-------- 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml index 2a175aa..7b5ac0c 100755 --- a/.github/workflows/create-release.yml +++ b/.github/workflows/create-release.yml @@ -114,7 +114,7 @@ jobs: - name: ldc2 build shell: cmd run: | - call vc_init.bat && C:\ldc2\bin\dub.exe build --force --combined --arch=${{ matrix.dub-arch }} --build=${{ matrix.build-type }} --compiler=C:\ldc2\bin\ldc2.exe + call vc_init.bat && C:\ldc2\bin\dub.exe build --force --combined --build-mode=allAtOnce --config=betterC-library --arch=${{ matrix.dub-arch }} --build=${{ matrix.build-type }} --compiler=C:\ldc2\bin\ldc2.exe - name: Create Windows archive run: | @@ -227,7 +227,7 @@ jobs: - name: ldc2 build run: | - /Users/runner/ldc2/bin/dub build --force --combined --arch=x86_64 --build=${{ matrix.build-type }} --compiler=/Users/runner/ldc2/bin/ldc2; + /Users/runner/ldc2/bin/dub build --force --combined --build-mode=allAtOnce --config=betterC-library --arch=x86_64 --build=${{ matrix.build-type }} --compiler=/Users/runner/ldc2/bin/ldc2; - name: Create OSX archive run: | @@ -344,9 +344,15 @@ jobs: - name: checkout uses: actions/checkout@v2 - - name: ldc2 build + - name: ldc2 betterC-library build + if: ${{ (matrix.dub-arch != 'wasm32-unknown-unknown-webassembly') }} + run: | + /home/runner/ldc2/bin/dub build --force --combined --build-mode=allAtOnce --config=betterC-library --arch=${{ matrix.dub-arch }} --build=${{ matrix.build-type }} --compiler=/home/runner/ldc2/bin/ldc2; + + - name: ldc2 wasm32 build + if: ${{ (matrix.dub-arch == 'wasm32-unknown-unknown-webassembly') }} run: | - /home/runner/ldc2/bin/dub build --force --combined --arch=${{ matrix.dub-arch }} --build=${{ matrix.build-type }} --compiler=/home/runner/ldc2/bin/ldc2; + /home/runner/ldc2/bin/dub build --force --combined --build-mode=allAtOnce --config=wasm32 --arch=${{ matrix.dub-arch }} --build=${{ matrix.build-type }} --compiler=/home/runner/ldc2/bin/ldc2; - name: Create Linux x86_64 archive if: ${{ (matrix.dub-arch == 'x86_64') }} diff --git a/.github/workflows/cross-compiling.yml b/.github/workflows/cross-compiling.yml index 75f895f..7ca14ca 100755 --- a/.github/workflows/cross-compiling.yml +++ b/.github/workflows/cross-compiling.yml @@ -129,18 +129,18 @@ jobs: if: ${{ (matrix.dub-arch == 'x86') || (matrix.dub-arch == 'x86_mscoff') }} shell: cmd run: | - call vc_init.bat && C:\D\dmd2\windows\bin\dub.exe build --force --combined --arch=x86_mscoff --build=${{ matrix.build-type }} --compiler=C:\D\dmd2\windows\bin\dmd.exe + call vc_init.bat && C:\D\dmd2\windows\bin\dub.exe test --force --combined --build-mode=allAtOnce --config=library --arch=x86_mscoff --build=${{ matrix.build-type }} --compiler=C:\D\dmd2\windows\bin\dmd.exe - name: dmd build if: ${{ (matrix.dub-arch != 'x86') && (matrix.dub-arch != 'x86_mscoff') }} shell: cmd run: | - call vc_init.bat && C:\D\dmd2\windows\bin\dub.exe build --force --combined --arch=${{ matrix.dub-arch }} --build=${{ matrix.build-type }} --compiler=C:\D\dmd2\windows\bin\dmd.exe + call vc_init.bat && C:\D\dmd2\windows\bin\dub.exe test --force --combined --build-mode=allAtOnce --config=library --arch=${{ matrix.dub-arch }} --build=${{ matrix.build-type }} --compiler=C:\D\dmd2\windows\bin\dmd.exe - name: ldc2 build shell: cmd run: | - call vc_init.bat && C:\ldc2\bin\dub.exe build --force --combined --arch=${{ matrix.dub-arch }} --build=${{ matrix.build-type }} --compiler=C:\ldc2\bin\ldc2.exe + call vc_init.bat && C:\ldc2\bin\dub.exe test --force --combined --build-mode=allAtOnce --config=library --arch=${{ matrix.dub-arch }} --build=${{ matrix.build-type }} --compiler=C:\ldc2\bin\ldc2.exe - name: Upload artifact uses: actions/upload-artifact@v2 @@ -254,11 +254,11 @@ jobs: - name: dmd build run: | - dub build --force --combined --build=${{ matrix.build-type }}; + dub test --force --combined --build-mode=allAtOnce --config=library --build=${{ matrix.build-type }}; - name: ldc2 build run: | - /Users/runner/ldc2/bin/dub build --force --combined --arch=x86_64 --build=${{ matrix.build-type }} --compiler=/Users/runner/ldc2/bin/ldc2; + /Users/runner/ldc2/bin/dub test --force --combined --build-mode=allAtOnce --config=library --arch=x86_64 --build=${{ matrix.build-type }} --compiler=/Users/runner/ldc2/bin/ldc2; - name: Upload artifact uses: actions/upload-artifact@v2 @@ -383,12 +383,12 @@ jobs: - name: dmd build run: | - dub build --force --combined --arch=${{ matrix.dub-arch }} --build=${{ matrix.build-type }}; + dub test --force --combined --build-mode=allAtOnce --config=library --arch=${{ matrix.dub-arch }} --build=${{ matrix.build-type }}; - name: ldc2 build run: | - /home/runner/ldc2/bin/dub build --force --combined --arch=${{ matrix.dub-arch }} --build=${{ matrix.build-type }} --compiler=/home/runner/ldc2/bin/ldc2; - /home/runner/ldc2/bin/dub build --force --combined --arch=wasm32-unknown-unknown-webassembly --build=${{ matrix.build-type }} --compiler=/home/runner/ldc2/bin/ldc2; + /home/runner/ldc2/bin/dub test --force --combined --build-mode=allAtOnce --config=library --arch=${{ matrix.dub-arch }} --build=${{ matrix.build-type }} --compiler=/home/runner/ldc2/bin/ldc2; + /home/runner/ldc2/bin/dub build --force --combined --build-mode=allAtOnce --config=wasm32 --arch=wasm32-unknown-unknown-webassembly --build=${{ matrix.build-type }} --compiler=/home/runner/ldc2/bin/ldc2; - name: Upload artifact uses: actions/upload-artifact@v2