-
Notifications
You must be signed in to change notification settings - Fork 4k
ARROW-14070: [C++][CI] Remove support for VS2015 #11211
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -83,12 +83,11 @@ if "%JOB%" NEQ "Build_Debug" ( | |
| @rem | ||
| if "%GENERATOR%"=="Ninja" set need_vcvarsall=1 | ||
| if defined need_vcvarsall ( | ||
| @rem Select desired compiler version | ||
| if "%APPVEYOR_BUILD_WORKER_IMAGE%" == "Visual Studio 2017" ( | ||
| call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64 | ||
| ) else ( | ||
| call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64 | ||
| if "%APPVEYOR_BUILD_WORKER_IMAGE%" NEQ "Visual Studio 2017" ( | ||
| @rem ARROW-14070 Visual Studio 2015 no longer supported | ||
| exit /B | ||
|
||
| ) | ||
| call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64 | ||
| ) | ||
|
|
||
| @rem | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -64,22 +64,7 @@ class SinkNode : public ExecNode { | |
| AsyncGenerator<util::optional<ExecBatch>>* out_gen) { | ||
| PushGenerator<util::optional<ExecBatch>> push_gen; | ||
| auto out = push_gen.producer(); | ||
| *out_gen = [push_gen] { | ||
| // Awful workaround for MSVC 19.0 (Visual Studio 2015) bug. | ||
| // For some types including Future<optional<ExecBatch>>, | ||
| // std::is_convertible<T, T>::value will be false causing | ||
| // SFINAE exclusion of the std::function constructor we need. | ||
| // Definining a convertible (but distinct) type soothes the | ||
| // faulty trait. | ||
| struct ConvertibleToFuture { | ||
| operator Future<util::optional<ExecBatch>>() && { // NOLINT runtime/explicit | ||
| return std::move(ret); | ||
| } | ||
| Future<util::optional<ExecBatch>> ret; | ||
| }; | ||
|
|
||
| return ConvertibleToFuture{push_gen()}; | ||
| }; | ||
| *out_gen = std::move(push_gen); | ||
|
||
| return out; | ||
| } | ||
|
|
||
|
|
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can we keep this one but switch to a newer VS? It also differs by not using conda packages for dependencies.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I've created https://issues.apache.org/jira/browse/ARROW-14075 to add vs2019 and non-conda jobs