Skip to content

Commit

Permalink
Merge pull request #531 from pmienk/version3
Browse files Browse the repository at this point in the history
Regenerate artifacts.
  • Loading branch information
evoskuil authored Feb 13, 2024
2 parents 3df0be0 + 4e437cb commit 315b2f7
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 11 deletions.
19 changes: 11 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -187,9 +187,10 @@ jobs:
- name: Coveralls.io Upload
if: ${{ matrix.coverage == 'cov' }}
uses: pmienk/coveralls-github-action@master
uses: coverallsapp/github-action@v2.2.3
with:
path-to-lcov: "./coverage.info"
format: lcov
files: "./coverage.info"
github-token: ${{ secrets.github_token }}

- name: Failure display available binaries
Expand Down Expand Up @@ -420,9 +421,10 @@ jobs:
- name: Coveralls.io Upload
if: ${{ matrix.coverage == 'cov' }}
uses: pmienk/coveralls-github-action@master
uses: coverallsapp/github-action@v2.2.3
with:
path-to-lcov: "./coverage.info"
format: lcov
files: "./coverage.info"
github-token: ${{ secrets.github_token }}

- name: Failure display available binaries
Expand Down Expand Up @@ -622,9 +624,10 @@ jobs:
- name: Coveralls.io Upload
if: ${{ matrix.coverage == 'cov' }}
uses: pmienk/coveralls-github-action@master
uses: coverallsapp/github-action@v2.2.3
with:
path-to-lcov: "./coverage.info"
format: lcov
files: "./coverage.info"
github-token: ${{ secrets.github_token }}

- name: Failure display available binaries
Expand Down Expand Up @@ -707,7 +710,7 @@ jobs:

steps:
- name: Add msbuild to PATH
uses: microsoft/setup-msbuild@v1.1
uses: microsoft/setup-msbuild@v2
with:
msbuild-architecture: x64

Expand Down Expand Up @@ -737,7 +740,7 @@ jobs:
}
- name: Execute build
run: .\build.cmd .. ${{ matrix.platform }} ${{ matrix.configuration }} ${{ matrix.version }}
run: .\build.cmd .. ${{ matrix.platform }} ${{ matrix.configuration }} x64 ${{ matrix.version }}

- name: Execute tests
shell: powershell
Expand Down
6 changes: 3 additions & 3 deletions build.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ SET "relative_path_base=%~1"
call cd /d "%relative_path_base%"
SET "path_base=%cd%"
SET "nuget_pkg_path=%path_base%\.nuget\packages"
SET "msbuild_args=/verbosity:minimal /p:Platform=%~2 /p:Configuration=%~3"
SET "proj_version=%~4"
SET "msbuild_args=/verbosity:minimal /p:Platform=%~2 /p:Configuration=%~3 /p:PreferredToolArchitecture=%~4"
SET "proj_version=%~5"
SET "msbuild_exe=msbuild"
IF EXIST "%~5" SET "msbuild_exe=%~5"
IF EXIST "%~6" SET "msbuild_exe=%~6"

call :pending "Build initialized..."
IF NOT EXIST "%nuget_pkg_path%" (
Expand Down

0 comments on commit 315b2f7

Please sign in to comment.