Skip to content

Commit

Permalink
Release 14.0.1 updated readme
Browse files Browse the repository at this point in the history
  • Loading branch information
lerno committed May 14, 2022
1 parent e5653dc commit 328c9a2
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 4 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
jobs:
windowsBuild:
name: Windows Build
runs-on: windows-2019
runs-on: windows-latest
env:
BUILD_PROJECT: llvm
BUILD_MASTER: false
Expand Down Expand Up @@ -35,14 +35,14 @@ jobs:
- name: Install
shell: cmd
run: |
call %GITHUB_WORKSPACE%\set-env.bat msvc16 ${{matrix.CRT}} ${{matrix.TARGET_CPU}} ${{matrix.CONFIGURATION}}
call %GITHUB_WORKSPACE%\set-env.bat msvc17 ${{matrix.CRT}} ${{matrix.TARGET_CPU}} ${{matrix.CONFIGURATION}}
call %GITHUB_WORKSPACE%\install.bat
- name: Build and test
id: BUILD
shell: cmd
run: |
call %GITHUB_WORKSPACE%\set-env.bat msvc16 ${{matrix.CRT}} ${{matrix.TARGET_CPU}} ${{matrix.CONFIGURATION}}
call %GITHUB_WORKSPACE%\set-env.bat msvc17 ${{matrix.CRT}} ${{matrix.TARGET_CPU}} ${{matrix.CONFIGURATION}}
call %GITHUB_WORKSPACE%\build.bat
echo ::set-output name=DEPLOY_FILE::%DEPLOY_FILE%
Expand Down
9 changes: 8 additions & 1 deletion set-env.bat
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ if /i "%1" == "x64" goto :amd64
@REM if /i "%1" == "msvc14" goto :msvc14
@REM if /i "%1" == "msvc15" goto :msvc15
if /i "%1" == "msvc16" goto :msvc16
if /i "%1" == "msvc17" goto :msvc17
if /i "%1" == "libcmt" goto :libcmt
if /i "%1" == "msvcrt" goto :msvcrt
if /i "%1" == "dbg" goto :dbg
Expand Down Expand Up @@ -80,6 +81,12 @@ set CMAKE_GENERATOR=Visual Studio 16 2019
shift
goto :loop

:msvc17
set TOOLCHAIN=msvc17
set CMAKE_GENERATOR=Visual Studio 17 2022
shift
goto :loop

:: . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .

:: CRT
Expand Down Expand Up @@ -136,7 +143,7 @@ if /i "%BUILD_MASTER%" == "true" (
)

if "%TARGET_CPU%" == "" goto :amd64
if "%TOOLCHAIN%" == "" goto :msvc16
if "%TOOLCHAIN%" == "" goto :msvc17
if "%CRT%" == "" goto :libcmt
if "%CONFIGURATION%" == "" goto :release

Expand Down

0 comments on commit 328c9a2

Please sign in to comment.