Skip to content

Commit ed4870c

Browse files
authored
chore: Update Visual Studio CI to VS 2022, and add VS Debug builds (XRPLF#5240)
* Debug builds do not run tests, because they take too long.
1 parent 5fbee8c commit ed4870c

File tree

1 file changed

+20
-14
lines changed

1 file changed

+20
-14
lines changed

.github/workflows/windows.yml

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,18 @@ jobs:
2424
strategy:
2525
fail-fast: false
2626
matrix:
27-
generator:
28-
- Visual Studio 16 2019
27+
version:
28+
- generator: Visual Studio 17 2022
29+
runs-on: windows-2022
2930
configuration:
30-
- Release
31-
# Github hosted runners tend to hang when running Debug unit tests.
32-
# Instead of trying to work around it, disable the Debug job until
33-
# something beefier (i.e. a heavy self-hosted runner) becomes
34-
# available.
35-
# - Debug
36-
runs-on: windows-2019
31+
- type: Release
32+
tests: true
33+
- type: Debug
34+
# Skip running unit tests on debug builds, because they
35+
# take an unreasonable amount of time
36+
tests: false
37+
runtime: d
38+
runs-on: ${{ matrix.version.runs-on }}
3739
env:
3840
build_dir: .build
3941
steps:
@@ -68,24 +70,28 @@ jobs:
6870
run: |
6971
conan profile new default --detect
7072
conan profile update settings.compiler.cppstd=20 default
71-
conan profile update settings.compiler.runtime=MT${{ matrix.configuration == 'Debug' && 'd' || '' }} default
73+
conan profile update \
74+
settings.compiler.runtime=MT${{ matrix.configuration.runtime }} \
75+
default
7276
- name: build dependencies
7377
uses: ./.github/actions/dependencies
7478
env:
7579
CONAN_URL: http://18.143.149.228:8081/artifactory/api/conan/conan-non-prod
7680
CONAN_LOGIN_USERNAME_RIPPLE: ${{ secrets.CONAN_USERNAME }}
7781
CONAN_PASSWORD_RIPPLE: ${{ secrets.CONAN_TOKEN }}
7882
with:
79-
configuration: ${{ matrix.configuration }}
83+
configuration: ${{ matrix.configuration.type }}
8084
- name: build
8185
uses: ./.github/actions/build
8286
with:
83-
generator: '${{ matrix.generator }}'
84-
configuration: ${{ matrix.configuration }}
87+
generator: '${{ matrix.version.generator }}'
88+
configuration: ${{ matrix.configuration.type }}
8589
# Hard code for now. Move to the matrix if varied options are needed
8690
cmake-args: '-Dassert=ON -Dreporting=OFF -Dunity=ON'
8791
cmake-target: install
8892
- name: test
8993
shell: bash
94+
if: ${{ matrix.configuration.tests }}
9095
run: |
91-
${build_dir}/${{ matrix.configuration }}/rippled --unittest --unittest-jobs $(nproc)
96+
${build_dir}/${{ matrix.configuration.type }}/rippled --unittest \
97+
--unittest-jobs $(nproc)

0 commit comments

Comments
 (0)