From 36e27683d32cc60297118791ab23863b7f2945d2 Mon Sep 17 00:00:00 2001 From: Ian Craggs Date: Fri, 9 Feb 2024 14:14:23 +0000 Subject: [PATCH 1/3] Fix AppVeyor build - Python versions --- appveyor.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 8e4b71bec..757d1da58 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -8,31 +8,34 @@ environment: PAHO_BUILD_STATIC: FALSE PAHO_BUILD_SHARED: TRUE PAHO_HIGH_PERFORMANCE: FALSE + PYTHON_VERSION: Python36 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 PAHO_WINDOWS_BUILD_BIT: x64 OPENSSL_ROOT_DIR: "C:/OpenSSL-Win64" PAHO_BUILD_STATIC: TRUE PAHO_BUILD_SHARED: FALSE PAHO_HIGH_PERFORMANCE: TRUE + PYTHON_VERSION: Python36 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 PAHO_WINDOWS_BUILD_BIT: x86 OPENSSL_ROOT_DIR: "C:/OpenSSL-Win32" PAHO_BUILD_STATIC: FALSE PAHO_BUILD_SHARED: TRUE PAHO_HIGH_PERFORMANCE: TRUE + PYTHON_VERSION: Python37 configuration: Debug install: - cmd: ver - cmd: openssl version - - cmd: C:\Python36\python --version - - cmd: netsh advfirewall firewall add rule name="Python 3.6" dir=in action=allow program="C:\Python36\python.exe" enable=yes + - cmd: C:\%PYTHON_VERSION%\python --version + - cmd: netsh advfirewall firewall add rule name="Python 3" dir=in action=allow program="C:\%PYTHON_VERSION%\python.exe" enable=yes - cmd: netsh advfirewall firewall add rule name="Open Port 1883" dir=in action=allow protocol=TCP localport=1883 - cmd: netsh advfirewall set allprofiles state off - - ps: Start-Process C:\Python36\python -ArgumentList 'test\mqttsas.py' + - ps: Start-Process C:\%PYTHON_VERSION%\python -ArgumentList 'test\mqttsas.py' - cmd: git clone https://github.com/eclipse/paho.mqtt.testing.git - cmd: cd paho.mqtt.testing\interoperability - - ps: Start-Process C:\Python36\python -ArgumentList 'startbroker.py -c localhost_testing.conf' + - ps: Start-Process C:\%PYTHON_VERSION%\python -ArgumentList 'startbroker.py -c localhost_testing.conf' - cmd: cd ..\.. build_script: From 93e420a952034a4c038176065179ad027cbd32c7 Mon Sep 17 00:00:00 2001 From: Ian Craggs Date: Fri, 9 Feb 2024 14:21:37 +0000 Subject: [PATCH 2/3] Fix AppVeyor Python version - part 2 --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 757d1da58..1a224fdf8 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -29,7 +29,7 @@ install: - cmd: ver - cmd: openssl version - cmd: C:\%PYTHON_VERSION%\python --version - - cmd: netsh advfirewall firewall add rule name="Python 3" dir=in action=allow program="C:\%PYTHON_VERSION%\python.exe" enable=yes + - cmd: netsh advfirewall firewall add rule name="Python 3" dir=in action=allow program=C:\%PYTHON_VERSION%\python.exe enable=yes - cmd: netsh advfirewall firewall add rule name="Open Port 1883" dir=in action=allow protocol=TCP localport=1883 - cmd: netsh advfirewall set allprofiles state off - ps: Start-Process C:\%PYTHON_VERSION%\python -ArgumentList 'test\mqttsas.py' From 942273fa75bf2f7aef783be7307968e63369e3f0 Mon Sep 17 00:00:00 2001 From: Ian Craggs Date: Fri, 9 Feb 2024 14:29:13 +0000 Subject: [PATCH 3/3] Change Powershell env references --- appveyor.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 1a224fdf8..f83a49d3b 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -29,13 +29,13 @@ install: - cmd: ver - cmd: openssl version - cmd: C:\%PYTHON_VERSION%\python --version - - cmd: netsh advfirewall firewall add rule name="Python 3" dir=in action=allow program=C:\%PYTHON_VERSION%\python.exe enable=yes + - cmd: netsh advfirewall firewall add rule name="Python 3" dir=in action=allow program="C:\%PYTHON_VERSION%\python.exe" enable=yes - cmd: netsh advfirewall firewall add rule name="Open Port 1883" dir=in action=allow protocol=TCP localport=1883 - cmd: netsh advfirewall set allprofiles state off - - ps: Start-Process C:\%PYTHON_VERSION%\python -ArgumentList 'test\mqttsas.py' + - ps: Start-Process C:\$Env:PYTHON_VERSION\python -ArgumentList 'test\mqttsas.py' - cmd: git clone https://github.com/eclipse/paho.mqtt.testing.git - cmd: cd paho.mqtt.testing\interoperability - - ps: Start-Process C:\%PYTHON_VERSION%\python -ArgumentList 'startbroker.py -c localhost_testing.conf' + - ps: Start-Process C:\$Env:PYTHON_VERSION\python -ArgumentList 'startbroker.py -c localhost_testing.conf' - cmd: cd ..\.. build_script: