Skip to content

Commit bf99f9e

Browse files
committed
Update workflows
1 parent e3a0ac9 commit bf99f9e

File tree

2 files changed

+9
-20
lines changed

2 files changed

+9
-20
lines changed

.github/workflows/examples.yml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@ jobs:
1414
fail-fast: true
1515

1616
matrix:
17-
os: [ubuntu-24.04, windows-latest, macos-15]
17+
os: [ubuntu-24.04, windows-2022, macos-15]
1818
build_type: [Debug, Release]
1919
cxx_compiler: [g++-14, clang++, cl]
2020
exclude:
21-
- os: windows-latest
22-
- os: windows-latest
21+
- os: windows-2022
22+
- os: windows-2022
2323
cxx_compiler: g++-14
24-
- os: windows-latest
24+
- os: windows-2022
2525
cxx_compiler: clang++
2626
- os: ubuntu-24.04
2727
cxx_compiler: cl
@@ -31,13 +31,14 @@ jobs:
3131
cxx_compiler: g++-14
3232

3333
steps:
34-
- uses: actions/checkout@v4
34+
- name: Checkout
35+
uses: actions/checkout@v4
3536

36-
- name: Set reusable strings
37+
- name: Setup build directory
3738
id: strings
3839
shell: bash
3940
run: |
40-
echo "build-output-dir=${{ github.workspace }}/build-examples" >> "$GITHUB_OUTPUT"
41+
echo "build-output-dir=${{ github.workspace }}/build.examples" >> "$GITHUB_OUTPUT"
4142
4243
- name: Configure CMake
4344
run: >

.github/workflows/tests.yml

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,8 @@ jobs:
1717
os: [ubuntu-24.04, windows-2022, macos-15]
1818
build_type: [Debug, Release]
1919
cxx_compiler: [g++-14, clang++, cl]
20-
include:
21-
- os: windows-2022
22-
extra_cmake_args: -T "version=14.40"
2320
exclude:
21+
- os: windows-2022
2422
- os: windows-2022
2523
cxx_compiler: g++-14
2624
- os: windows-2022
@@ -33,15 +31,6 @@ jobs:
3331
cxx_compiler: g++-14
3432

3533
steps:
36-
- name: Install winget
37-
if: matrix.os == 'windows-2022'
38-
uses: Cyberboss/install-winget@v1
39-
40-
- name: Install Visual Studio components
41-
if: matrix.os == 'windows-2022'
42-
run: |
43-
echo "y" | winget install --id=Microsoft.VisualStudio.2022.Enterprise --override "modify --quiet --add Microsoft.VisualStudio.Component.VC.14.40.17.10.x86.x64"
44-
4534
- name: Checkout
4635
uses: actions/checkout@v4
4736

@@ -56,7 +45,6 @@ jobs:
5645
cmake -B ${{ steps.strings.outputs.build-output-dir }}
5746
-DCMAKE_CXX_COMPILER=${{ matrix.cxx_compiler }}
5847
-DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
59-
${{ matrix.extra_cmake_args }}
6048
-S ${{ github.workspace }}
6149
6250
- name: Build tests

0 commit comments

Comments
 (0)