File tree Expand file tree Collapse file tree 10 files changed +15
-14
lines changed
docs/source/developers/cpp Expand file tree Collapse file tree 10 files changed +15
-14
lines changed Original file line number Diff line number Diff line change @@ -375,7 +375,7 @@ jobs:
375375
376376 windows-mingw :
377377 name : AMD64 Windows MinGW ${{ matrix.msystem_upper }} C++
378- runs-on : windows-2019
378+ runs-on : windows-2022
379379 if : ${{ !contains(github.event.pull_request.title, 'WIP') }}
380380 # Build may take 1h+ without cache.
381381 timeout-minutes : 120
Original file line number Diff line number Diff line change 7373 run : ci/scripts/csharp_test.sh $(pwd)
7474
7575 windows :
76- name : AMD64 Windows 2019 18.04 C# ${{ matrix.dotnet }}
77- runs-on : windows-2019
76+ name : AMD64 Windows C# ${{ matrix.dotnet }}
77+ runs-on : windows-2022
7878 if : ${{ !contains(github.event.pull_request.title, 'WIP') }}
7979 timeout-minutes : 15
8080 strategy :
Original file line number Diff line number Diff line change @@ -196,7 +196,7 @@ jobs:
196196
197197 windows-cpp :
198198 name : AMD64 Windows C++ RTools ${{ matrix.config.rtools }} ${{ matrix.config.arch }}
199- runs-on : windows-2019
199+ runs-on : windows-2022
200200 if : ${{ !contains(github.event.pull_request.title, 'WIP') }}
201201 timeout-minutes : 90
202202 strategy :
@@ -248,7 +248,7 @@ jobs:
248248 windows-r :
249249 needs : [windows-cpp]
250250 name : AMD64 Windows R ${{ matrix.config.rversion }}
251- runs-on : windows-2019
251+ runs-on : windows-2022
252252 if : ${{ !contains(github.event.pull_request.title, 'WIP') }}
253253 timeout-minutes : 75
254254 strategy :
Original file line number Diff line number Diff line change @@ -201,7 +201,7 @@ jobs:
201201
202202 windows-mingw :
203203 name : AMD64 Windows MinGW ${{ matrix.mingw-n-bits }} GLib & Ruby
204- runs-on : windows-2019
204+ runs-on : windows-2022
205205 if : ${{ !contains(github.event.pull_request.title, 'WIP') }}
206206 timeout-minutes : 90
207207 strategy :
Original file line number Diff line number Diff line change @@ -69,7 +69,7 @@ call conda create --no-shortcuts -c conda-forge -f -q -y -p %_VERIFICATION_CONDA
6969
7070call activate %_VERIFICATION_CONDA_ENV% || exit /B 1
7171
72- set GENERATOR = Visual Studio 16 2019
72+ set GENERATOR = Visual Studio 17 2022
7373set ARCHITECTURE = x64
7474set CONFIGURATION = release
7575
@@ -84,7 +84,7 @@ mkdir !ARROW_SOURCE!\cpp\build
8484pushd !ARROW_SOURCE! \cpp\build
8585
8686@ rem This is the path for Visual Studio Community 2017
87- call " C:\Program Files (x86) \Microsoft Visual Studio\2017\Community\Common7\Tools\VsDevCmd .bat" -arch=amd64
87+ call " C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall .bat" x64
8888
8989@ rem NOTE(wesm): not using Ninja for now to be able to more easily control the
9090@ rem generator used
Original file line number Diff line number Diff line change @@ -632,6 +632,7 @@ tasks:
632632 env :
633633 PYARROW_TEST_GDB : " OFF"
634634 script : " verify-release-candidate.bat"
635+ timeout : 120
635636
636637# ############################# Docker tests ##################################
637638
Original file line number Diff line number Diff line change @@ -51,7 +51,7 @@ pushd cpp\build
5151@ rem TODO(ianmcook): Add -DARROW_BUILD_BENCHMARKS=ON after the issue described
5252@ rem at https://github.com/google/benchmark/issues/1046 is resolved
5353
54- cmake -G " Visual Studio 16 2019 " -A x64 ^
54+ cmake -G " Visual Studio 17 2022 " -A x64 ^
5555 -DARROW_BOOST_USE_SHARED=ON ^
5656 -DARROW_BUILD_SHARED=ON ^
5757 -DARROW_BUILD_STATIC=OFF ^
Original file line number Diff line number Diff line change 2222jobs :
2323 test-vcpkg-win :
2424 name : Install build deps with vcpkg and build Arrow C++
25- runs-on : windows-2019
25+ runs-on : windows-2022
2626 env :
2727 VCPKG_BINARY_SOURCES : ' clear;nuget,GitHub,readwrite'
2828 VCPKG_DEFAULT_TRIPLET : ' x64-windows'
Original file line number Diff line number Diff line change 2222jobs :
2323 verify :
2424 name : " Verify release candidate Windows source"
25- runs-on : windows-2019
25+ runs-on : windows-2022
2626 {% if env is defined %}
2727 env :
2828 {% for key, value in env.items() %}
2929 {{ key }}: {{ value }}
3030 {% endfor %}
3131 {% endif %}
32- timeout-minutes : 60
32+ timeout-minutes : {{ timeout|default(60) }}
3333
3434 steps :
3535 {{ macros.github_checkout_arrow(fetch_depth=0)|indent }}
Original file line number Diff line number Diff line change @@ -170,12 +170,12 @@ an out of source build by generating a MSVC solution:
170170 cd cpp
171171 mkdir build
172172 cd build
173- cmake .. -G " Visual Studio 15 2017 " -A x64 ^
173+ cmake .. -G " Visual Studio 16 2019 " -A x64 ^
174174 -DARROW_BUILD_TESTS=ON
175175 cmake --build . --config Release
176176
177177 For newer versions of Visual Studio, specify the generator
178- ``Visual Studio 16 2019 `` or see ``cmake --help `` for available
178+ ``Visual Studio 17 2022 `` or see ``cmake --help `` for available
179179generators.
180180
181181Building with Ninja and sccache
You can’t perform that action at this time.
0 commit comments