Skip to content

Commit 6fe8afb

Browse files
authored
[CI] Moves swift actions to use next (#8632)
* Moves to use swift-actions@next until final release is out * Migrates to vapor that uses swiftly actions * Trying to use windows 2022
1 parent 00eec24 commit 6fe8afb

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

.github/workflows/build.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ jobs:
129129

130130
build-cpp-std:
131131
name: Build Windows C++
132-
runs-on: windows-2019
132+
runs-on: windows-2022
133133
strategy:
134134
matrix:
135135
std: [11, 14, 17, 20, 23]
@@ -140,7 +140,7 @@ jobs:
140140
uses: microsoft/[email protected]
141141
- name: cmake
142142
run: >
143-
cmake -G "Visual Studio 16 2019" -A x64 -DCMAKE_BUILD_TYPE=Release
143+
cmake -G "Visual Studio 17 2022" -A x64 -DCMAKE_BUILD_TYPE=Release
144144
-DFLATBUFFERS_STRICT_MODE=ON
145145
-DFLATBUFFERS_CPP_STD=${{ matrix.std }}
146146
-DFLATBUFFERS_BUILD_CPP17=${{ matrix.std >= 17 && 'On' || 'Off'}}
@@ -157,14 +157,14 @@ jobs:
157157
contents: write
158158
outputs:
159159
digests: ${{ steps.hash.outputs.hashes }}
160-
name: Build Windows 2019
161-
runs-on: windows-2019
160+
name: Build Windows 2022
161+
runs-on: windows-2022
162162
steps:
163163
- uses: actions/checkout@v3
164164
- name: Add msbuild to PATH
165165
uses: microsoft/[email protected]
166166
- name: cmake
167-
run: cmake -G "Visual Studio 16 2019" -A x64 -DCMAKE_BUILD_TYPE=Release -DFLATBUFFERS_BUILD_CPP17=ON -DFLATBUFFERS_STRICT_MODE=ON .
167+
run: cmake -G "Visual Studio 17 2022" -A x64 -DCMAKE_BUILD_TYPE=Release -DFLATBUFFERS_BUILD_CPP17=ON -DFLATBUFFERS_STRICT_MODE=ON .
168168
- name: build
169169
run: msbuild.exe FlatBuffers.sln /p:Configuration=Release /p:Platform=x64
170170
- name: test
@@ -344,13 +344,13 @@ jobs:
344344

345345
build-generator-windows:
346346
name: Check Generated Code on Windows
347-
runs-on: windows-2019
347+
runs-on: windows-2022
348348
steps:
349349
- uses: actions/checkout@v3
350350
- name: Add msbuild to PATH
351351
uses: microsoft/[email protected]
352352
- name: cmake
353-
run: cmake -G "Visual Studio 16 2019" -A x64 -DCMAKE_BUILD_TYPE=Release -DFLATBUFFERS_BUILD_CPP17=ON -DFLATBUFFERS_STRICT_MODE=ON .
353+
run: cmake -G "Visual Studio 17 2022" -A x64 -DCMAKE_BUILD_TYPE=Release -DFLATBUFFERS_BUILD_CPP17=ON -DFLATBUFFERS_STRICT_MODE=ON .
354354
- name: build
355355
run: msbuild.exe FlatBuffers.sln /p:Configuration=Release /p:Platform=x64
356356
- name: Generate
@@ -500,9 +500,9 @@ jobs:
500500
runs-on: ubuntu-22.04
501501
steps:
502502
- uses: actions/checkout@v3
503-
- uses: swift-actions/setup-swift@v2
503+
- uses: vapor/[email protected]
504504
with:
505-
swift-version: ${{ matrix.swift }}
505+
toolchain: ${{ matrix.swift }}
506506
- name: Get swift version
507507
run: swift --version
508508
- name: test

0 commit comments

Comments
 (0)