Skip to content

Commit

Permalink
Update CI configuration
Browse files Browse the repository at this point in the history
Use the latest setup-dlang version, remove use of (removed) set-env,
and change the way we pass LIB to the linker.
  • Loading branch information
Geod24 committed Feb 8, 2021
1 parent 9b39764 commit 4dbddf4
Showing 1 changed file with 10 additions and 9 deletions.
19 changes: 10 additions & 9 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,9 @@ jobs:
- uses: actions/checkout@v2
# Install the D compiler
- name: Prepare compiler
uses: mihails-strasuns/setup-dlang@v0.5.0
uses: mihails-strasuns/setup-dlang@v1
with:
compiler: ${{ matrix.dc }}
gh_token: ${{ secrets.GITHUB_TOKEN }}

# Install os-specific packages
- name: '[Posix] Install dependencies'
Expand Down Expand Up @@ -72,12 +71,6 @@ jobs:
}
Expand-Archive '${{ github.workspace }}\lib\libsodium.zip' -DestinationPath '${{ github.workspace }}\lib\'
# Need to be its own step because we execute either the restore cache step or the download libsodium step
- name: '[Windows] Setup LIB variable'
if: runner.os == 'Windows'
run: |
echo "::set-env name=LIB::${{ github.workspace }}\lib\libsodium\x64\Release\v142\static\;$LIB"
# Build and run the tests
- name: '[POSIX] Build & test'
if: runner.os != 'Windows'
Expand All @@ -86,6 +79,14 @@ jobs:
- name: '[Windows] Build & test'
if: runner.os == 'Windows'
shell: cmd
env:
LIB: ${{ github.workspace }}\lib\libsodium\x64\Release\v142\static\;$LIB
run: |
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
dub test -v --compiler=${{ env.DC }}
dub test --compiler=${{ env.DC }}
if %errorlevel% neq 0 exit /b %errorlevel%
- name: 'Upload code coverage'
uses: codecov/codecov-action@v1
with:
flags: unittests

0 comments on commit 4dbddf4

Please sign in to comment.