Browse Source

package/ci: Python 3.6 is not on AppVeyor MSVC 2019+ images anymore.

next
Vladimír Vondruš 2 years ago
parent
commit
7f161b3cf4
  1. 4
      package/ci/appveyor-desktop-gles.bat
  2. 4
      package/ci/appveyor-desktop.bat
  3. 29
      package/ci/appveyor.yml

4
package/ci/appveyor-desktop-gles.bat

@ -8,7 +8,7 @@ cd pybind11-%PYBIND% || exit /b
mkdir -p build && cd build || exit /b mkdir -p build && cd build || exit /b
cmake .. ^ cmake .. ^
-DCMAKE_INSTALL_PREFIX=%APPVEYOR_BUILD_FOLDER%/deps ^ -DCMAKE_INSTALL_PREFIX=%APPVEYOR_BUILD_FOLDER%/deps ^
-DPYBIND11_PYTHON_VERSION=3.6 ^ -DPYBIND11_PYTHON_VERSION=3.%PYTHON% ^
-DPYBIND11_TEST=OFF ^ -DPYBIND11_TEST=OFF ^
-G Ninja || exit /b -G Ninja || exit /b
ninja install || exit /b ninja install || exit /b
@ -102,7 +102,7 @@ mkdir build && cd build || exit /b
cmake .. ^ cmake .. ^
-DCMAKE_BUILD_TYPE=Release ^ -DCMAKE_BUILD_TYPE=Release ^
-DCMAKE_INSTALL_PREFIX=%APPVEYOR_BUILD_FOLDER%/deps ^ -DCMAKE_INSTALL_PREFIX=%APPVEYOR_BUILD_FOLDER%/deps ^
-DPYBIND11_PYTHON_VERSION=3.6 ^ -DPYBIND11_PYTHON_VERSION=3.%PYTHON% ^
-DMAGNUM_WITH_PYTHON=ON ^ -DMAGNUM_WITH_PYTHON=ON ^
-DMAGNUM_BUILD_TESTS=ON ^ -DMAGNUM_BUILD_TESTS=ON ^
-G Ninja || exit /b -G Ninja || exit /b

4
package/ci/appveyor-desktop.bat

@ -20,7 +20,7 @@ cd pybind11-%PYBIND% || exit /b
mkdir -p build && cd build || exit /b mkdir -p build && cd build || exit /b
cmake .. ^ cmake .. ^
-DCMAKE_INSTALL_PREFIX=%APPVEYOR_BUILD_FOLDER%/deps ^ -DCMAKE_INSTALL_PREFIX=%APPVEYOR_BUILD_FOLDER%/deps ^
-DPYBIND11_PYTHON_VERSION=3.6 ^ -DPYBIND11_PYTHON_VERSION=3.%PYTHON% ^
-DPYBIND11_TEST=OFF ^ -DPYBIND11_TEST=OFF ^
-G Ninja || exit /b -G Ninja || exit /b
ninja install || exit /b ninja install || exit /b
@ -113,7 +113,7 @@ cmake .. ^
-DCMAKE_BUILD_TYPE=Release ^ -DCMAKE_BUILD_TYPE=Release ^
-DCMAKE_INSTALL_PREFIX=%APPVEYOR_BUILD_FOLDER%/deps ^ -DCMAKE_INSTALL_PREFIX=%APPVEYOR_BUILD_FOLDER%/deps ^
-DCMAKE_PREFIX_PATH=%APPVEYOR_BUILD_FOLDER%/SDL ^ -DCMAKE_PREFIX_PATH=%APPVEYOR_BUILD_FOLDER%/SDL ^
-DPYBIND11_PYTHON_VERSION=3.6 ^ -DPYBIND11_PYTHON_VERSION=3.%PYTHON% ^
-DMAGNUM_WITH_PYTHON=ON ^ -DMAGNUM_WITH_PYTHON=ON ^
-DMAGNUM_BUILD_TESTS=ON ^ -DMAGNUM_BUILD_TESTS=ON ^
%COMPILER_EXTRA% -G Ninja || exit /b %COMPILER_EXTRA% -G Ninja || exit /b

29
package/ci/appveyor.yml

@ -6,33 +6,34 @@ environment:
COMPILER: msvc COMPILER: msvc
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
APPVEYOR_JOB_NAME: windows-msvc2017 APPVEYOR_JOB_NAME: windows-msvc2017
PYTHON: 36 PYTHON: 6
PYBIND: 2.3.0 PYBIND: 2.3.0
- TARGET: desktop - TARGET: desktop
COMPILER: msvc COMPILER: msvc
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
APPVEYOR_JOB_NAME: windows-msvc2019 APPVEYOR_JOB_NAME: windows-msvc2019
PYTHON: 36 # Python 3.6 was removed from 2019 and 2022 images in Dec 2023
PYTHON: 7
PYBIND: 2.3.0 PYBIND: 2.3.0
- TARGET: desktop - TARGET: desktop
COMPILER: msvc COMPILER: msvc
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022 APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
APPVEYOR_JOB_NAME: windows-msvc2022 APPVEYOR_JOB_NAME: windows-msvc2022
PYTHON: 36 PYTHON: 7
PYBIND: 2.9.0 # first supporting MSVC 2022 PYBIND: 2.9.0 # first supporting MSVC 2022
- TARGET: desktop - TARGET: desktop
COMPILER: msvc COMPILER: msvc
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
APPVEYOR_JOB_NAME: windows-static-msvc2019 APPVEYOR_JOB_NAME: windows-static-msvc2019
BUILD_STATIC: ON BUILD_STATIC: ON
PYTHON: 36 PYTHON: 7
PYBIND: 2.3.0 PYBIND: 2.3.0
- TARGET: desktop - TARGET: desktop
COMPILER: msvc COMPILER: msvc
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022 APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
APPVEYOR_JOB_NAME: windows-static-msvc2022 APPVEYOR_JOB_NAME: windows-static-msvc2022
BUILD_STATIC: ON BUILD_STATIC: ON
PYTHON: 36 PYTHON: 7
PYBIND: 2.9.0 # first supporting MSVC 2022 PYBIND: 2.9.0 # first supporting MSVC 2022
# clang-cl crashes with pybind11, "Illegal instruction" and # clang-cl crashes with pybind11, "Illegal instruction" and
# lld-link: warning: ignoring unknown argument '-flto' # lld-link: warning: ignoring unknown argument '-flto'
@ -42,13 +43,13 @@ environment:
#COMPILER: msvc-clang #COMPILER: msvc-clang
#APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 #APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
#APPVEYOR_JOB_NAME: windows-msvc2019-clang #APPVEYOR_JOB_NAME: windows-msvc2019-clang
#PYTHON: 36 #PYTHON: 7
#PYBIND: 2.7.0 #PYBIND: 2.7.0
#- TARGET: desktop #- TARGET: desktop
#COMPILER: msvc-clang #COMPILER: msvc-clang
#APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022 #APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
#APPVEYOR_JOB_NAME: windows-msvc2022-clang #APPVEYOR_JOB_NAME: windows-msvc2022-clang
#PYTHON: 36 #PYTHON: 7
#PYBIND: 2.9.0 # first supporting MSVC 2022 #PYBIND: 2.9.0 # first supporting MSVC 2022
- TARGET: desktop - TARGET: desktop
COMPILER: msvc COMPILER: msvc
@ -56,7 +57,7 @@ environment:
COMPILER_EXTRA: -DCMAKE_CXX_FLAGS="/permissive- /EHsc" -DMSVC_COMPATIBILITY=OFF COMPILER_EXTRA: -DCMAKE_CXX_FLAGS="/permissive- /EHsc" -DMSVC_COMPATIBILITY=OFF
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
APPVEYOR_JOB_NAME: windows-conforming-msvc2019 APPVEYOR_JOB_NAME: windows-conforming-msvc2019
PYTHON: 36 PYTHON: 7
PYBIND: 2.3.0 PYBIND: 2.3.0
- TARGET: desktop - TARGET: desktop
COMPILER: msvc COMPILER: msvc
@ -64,35 +65,35 @@ environment:
COMPILER_EXTRA: -DCMAKE_CXX_FLAGS="/permissive- /EHsc" -DMSVC_COMPATIBILITY=OFF COMPILER_EXTRA: -DCMAKE_CXX_FLAGS="/permissive- /EHsc" -DMSVC_COMPATIBILITY=OFF
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022 APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
APPVEYOR_JOB_NAME: windows-conforming-msvc2022 APPVEYOR_JOB_NAME: windows-conforming-msvc2022
PYTHON: 36 PYTHON: 7
PYBIND: 2.9.0 # first supporting MSVC 2022 PYBIND: 2.9.0 # first supporting MSVC 2022
- TARGET: desktop-gles - TARGET: desktop-gles
TARGET_GLES2: ON TARGET_GLES2: ON
COMPILER: msvc COMPILER: msvc
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
APPVEYOR_JOB_NAME: windows-gles2-msvc2019 APPVEYOR_JOB_NAME: windows-gles2-msvc2019
PYTHON: 36 PYTHON: 7
PYBIND: 2.3.0 PYBIND: 2.3.0
- TARGET: desktop-gles - TARGET: desktop-gles
TARGET_GLES2: ON TARGET_GLES2: ON
COMPILER: msvc COMPILER: msvc
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022 APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
APPVEYOR_JOB_NAME: windows-gles2-msvc2022 APPVEYOR_JOB_NAME: windows-gles2-msvc2022
PYTHON: 36 PYTHON: 7
PYBIND: 2.9.0 # first supporting MSVC 2022 PYBIND: 2.9.0 # first supporting MSVC 2022
- TARGET: desktop-gles - TARGET: desktop-gles
TARGET_GLES2: OFF TARGET_GLES2: OFF
COMPILER: msvc COMPILER: msvc
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
APPVEYOR_JOB_NAME: windows-gles3-msvc2019 APPVEYOR_JOB_NAME: windows-gles3-msvc2019
PYTHON: 36 PYTHON: 7
PYBIND: 2.3.0 PYBIND: 2.3.0
- TARGET: desktop-gles - TARGET: desktop-gles
TARGET_GLES2: OFF TARGET_GLES2: OFF
COMPILER: msvc COMPILER: msvc
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022 APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
APPVEYOR_JOB_NAME: windows-gles3-msvc2022 APPVEYOR_JOB_NAME: windows-gles3-msvc2022
PYTHON: 36 PYTHON: 7
PYBIND: 2.9.0 # first supporting MSVC 2022 PYBIND: 2.9.0 # first supporting MSVC 2022
install: install:
@ -106,7 +107,7 @@ install:
- appveyor DownloadFile https://uploader.codecov.io/latest/windows/codecov.exe -FileName C:/tools/codecov.exe - appveyor DownloadFile https://uploader.codecov.io/latest/windows/codecov.exe -FileName C:/tools/codecov.exe
# pip is in Scripts # pip is in Scripts
- set PATH=C:/tools/ninja;C:/Python%PYTHON%-x64;C:/Python%PYTHON%-x64/Scripts;%PATH% - set PATH=C:/tools/ninja;C:/Python3%PYTHON%-x64;C:/Python3%PYTHON%-x64/Scripts;%PATH%
- pip3 install coverage - pip3 install coverage
- IF NOT "%BUILD_STATIC%" == "ON" set BUILD_STATIC=OFF - IF NOT "%BUILD_STATIC%" == "ON" set BUILD_STATIC=OFF

Loading…
Cancel
Save