From b3c563f46f97ef8392f502ce6a3b0867722b525a Mon Sep 17 00:00:00 2001 From: Brian Date: Fri, 27 Oct 2023 12:13:59 +1100 Subject: [PATCH 1/9] Enhanced Logging and Directory Verification for CI/CD Script Investigating why CI/CD is failing in main branch --- .appveyor.yml | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index ef47797e..009314ad 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -6,23 +6,40 @@ image: - Visual Studio 2019 install: - cmd: >- - if /i "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2017" (call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" x86) & (set QTDIR=C:\Qt\5.13\msvc2017) + if /i "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2017" ( + call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" x86 + set QTDIR=C:\Qt\5.13\msvc2017 + ) - if /i "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2019" (call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" x64) & (set QTDIR=C:\Qt\6.1\msvc2019_64) + if /i "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2019" ( + call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" x64 + set QTDIR=C:\Qt\6.1\msvc2019_64 + ) + echo QT Directory: %QTDIR% set path=%PATH%;%QTDIR%\bin + echo Updated PATH: %PATH% + echo Listing contents of %QTDIR%\bin: + build_script: - cmd: >- + echo Checking qmake existence in %QTDIR%\bin + if exist "%QTDIR%\bin\qmake.exe" ( + echo qmake found! + ) else ( + echo qmake not found! + dir "%QTDIR%\bin" + exit /b 1 + ) nmake -f Makefile.nmake -nologo CFLAGS="-W3 -Os -MDd" - cd tests - qmake CONFIG-=release CONFIG+=debug - nmake -nologo -s + test_script: - cmd: >- nmake -s -nologo TESTARGS=-silent check + artifacts: - path: lib\tinycbor.lib deploy: off From 367c4b4952586f9d2cf59ed31aed6c6b577adfe4 Mon Sep 17 00:00:00 2001 From: Brian Date: Fri, 27 Oct 2023 12:25:42 +1100 Subject: [PATCH 2/9] Update .appveyor.yml --- .appveyor.yml | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 009314ad..515a921f 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -6,18 +6,12 @@ image: - Visual Studio 2019 install: - cmd: >- - if /i "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2017" ( - call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" x86 - set QTDIR=C:\Qt\5.13\msvc2017 - ) + if /i "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2017" (call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" x86) & (set QTDIR=C:\Qt\5.13\msvc2017) + if /i "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2019" (call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" x64) & (set QTDIR=C:\Qt\6.1\msvc2019_64) - if /i "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2019" ( - call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" x64 - set QTDIR=C:\Qt\6.1\msvc2019_64 - ) + set path=%PATH%;%QTDIR%\bin echo QT Directory: %QTDIR% - set path=%PATH%;%QTDIR%\bin echo Updated PATH: %PATH% echo Listing contents of %QTDIR%\bin: From 4ef9f8fb4f5e5c18600eff3bea63068b0de02c76 Mon Sep 17 00:00:00 2001 From: Brian Date: Fri, 27 Oct 2023 12:28:43 +1100 Subject: [PATCH 3/9] Update .appveyor.yml --- .appveyor.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 515a921f..85966895 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -6,11 +6,15 @@ image: - Visual Studio 2019 install: - cmd: >- - if /i "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2017" (call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" x86) & (set QTDIR=C:\Qt\5.13\msvc2017) - if /i "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2019" (call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" x64) & (set QTDIR=C:\Qt\6.1\msvc2019_64) - + if /i "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2017" ( + call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" x86 + set QTDIR=C:\Qt\5.13\msvc2017 + ) + if /i "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2019" ( + call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" x64 + set QTDIR=C:\Qt\6.1\msvc2019_64 + ) set path=%PATH%;%QTDIR%\bin - echo QT Directory: %QTDIR% echo Updated PATH: %PATH% echo Listing contents of %QTDIR%\bin: From 98831baa1d4627bf1bb59753c130de5345e24320 Mon Sep 17 00:00:00 2001 From: Brian Date: Fri, 27 Oct 2023 12:58:17 +1100 Subject: [PATCH 4/9] Update .appveyor.yml --- .appveyor.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 85966895..09fe25d2 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -5,7 +5,7 @@ image: - Visual Studio 2017 - Visual Studio 2019 install: -- cmd: >- +- cmd: |- if /i "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2017" ( call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" x86 set QTDIR=C:\Qt\5.13\msvc2017 @@ -20,7 +20,7 @@ install: echo Listing contents of %QTDIR%\bin: build_script: -- cmd: >- +- cmd: |- echo Checking qmake existence in %QTDIR%\bin if exist "%QTDIR%\bin\qmake.exe" ( echo qmake found! @@ -35,7 +35,7 @@ build_script: nmake -nologo -s test_script: -- cmd: >- +- cmd: |- nmake -s -nologo TESTARGS=-silent check artifacts: From 0c19727e938ae0a66004473faaa6dd5e5b6e8cd3 Mon Sep 17 00:00:00 2001 From: Brian Date: Fri, 27 Oct 2023 13:05:48 +1100 Subject: [PATCH 5/9] Update .appveyor.yml --- .appveyor.yml | 29 +++++++---------------------- 1 file changed, 7 insertions(+), 22 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 09fe25d2..cddcc2fb 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -5,39 +5,24 @@ image: - Visual Studio 2017 - Visual Studio 2019 install: -- cmd: |- - if /i "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2017" ( - call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" x86 - set QTDIR=C:\Qt\5.13\msvc2017 - ) - if /i "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2019" ( - call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" x64 - set QTDIR=C:\Qt\6.1\msvc2019_64 - ) +- cmd: >- + if /i "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2017" (call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" x86 & set QTDIR=C:\Qt\5.13\msvc2017) + if /i "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2019" (call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" x64 & set QTDIR=C:\Qt\6.1\msvc2019_64) + set path=%PATH%;%QTDIR%\bin + echo QT Directory: %QTDIR% echo Updated PATH: %PATH% echo Listing contents of %QTDIR%\bin: - build_script: -- cmd: |- - echo Checking qmake existence in %QTDIR%\bin - if exist "%QTDIR%\bin\qmake.exe" ( - echo qmake found! - ) else ( - echo qmake not found! - dir "%QTDIR%\bin" - exit /b 1 - ) +- cmd: >- nmake -f Makefile.nmake -nologo CFLAGS="-W3 -Os -MDd" cd tests qmake CONFIG-=release CONFIG+=debug nmake -nologo -s - test_script: -- cmd: |- +- cmd: >- nmake -s -nologo TESTARGS=-silent check - artifacts: - path: lib\tinycbor.lib deploy: off From 77e472bb9c323a75a10bd98cb7553b21d4050811 Mon Sep 17 00:00:00 2001 From: Brian Date: Fri, 27 Oct 2023 13:10:23 +1100 Subject: [PATCH 6/9] Update .appveyor.yml --- .appveyor.yml | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/.appveyor.yml b/.appveyor.yml index cddcc2fb..9aa66536 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -1,3 +1,44 @@ +version: 0.6-build-{build} +pull_requests: + do_not_increment_build_number: true +image: +- Visual Studio 2017 +- Visual Studio 2019 +install: +- cmd: >- + if /i "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2017" (call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" x86) & (set QTDIR=C:\Qt\5.13\msvc2017) + + if /i "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2019" (call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" x64) & (set QTDIR=C:\Qt\6.1\msvc2019_64) + + set path=%PATH%;%QTDIR%\bin + + echo QT Directory: %QTDIR% + + echo Updated PATH: %PATH% + + dir /b /a-d %QTDIR%\bin + +build_script: +- cmd: >- + nmake -f Makefile.nmake -nologo CFLAGS="-W3 -Os -MDd" + + cd tests + + qmake CONFIG-=release CONFIG+=debug + + nmake -nologo -s +test_script: +- cmd: >- + nmake -s -nologo TESTARGS=-silent check +artifacts: +- path: lib\tinycbor.lib +deploy: off + + + + + + version: 0.6-build-{build} pull_requests: do_not_increment_build_number: true From a66a9a45c22374c5a0e66f6abc99cd897ec56c7b Mon Sep 17 00:00:00 2001 From: Brian Date: Fri, 27 Oct 2023 13:10:44 +1100 Subject: [PATCH 7/9] Update .appveyor.yml --- .appveyor.yml | 33 --------------------------------- 1 file changed, 33 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 9aa66536..47e6bef6 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -34,36 +34,3 @@ artifacts: - path: lib\tinycbor.lib deploy: off - - - - - -version: 0.6-build-{build} -pull_requests: - do_not_increment_build_number: true -image: -- Visual Studio 2017 -- Visual Studio 2019 -install: -- cmd: >- - if /i "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2017" (call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" x86 & set QTDIR=C:\Qt\5.13\msvc2017) - if /i "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2019" (call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" x64 & set QTDIR=C:\Qt\6.1\msvc2019_64) - - set path=%PATH%;%QTDIR%\bin - - echo QT Directory: %QTDIR% - echo Updated PATH: %PATH% - echo Listing contents of %QTDIR%\bin: -build_script: -- cmd: >- - nmake -f Makefile.nmake -nologo CFLAGS="-W3 -Os -MDd" - cd tests - qmake CONFIG-=release CONFIG+=debug - nmake -nologo -s -test_script: -- cmd: >- - nmake -s -nologo TESTARGS=-silent check -artifacts: -- path: lib\tinycbor.lib -deploy: off From 7b29ec39cbcf2502f44b48fdc692af735b7cf9e0 Mon Sep 17 00:00:00 2001 From: Brian Date: Fri, 27 Oct 2023 13:26:16 +1100 Subject: [PATCH 8/9] Update .appveyor.yml --- .appveyor.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 47e6bef6..88c56f94 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -8,16 +8,14 @@ install: - cmd: >- if /i "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2017" (call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" x86) & (set QTDIR=C:\Qt\5.13\msvc2017) - if /i "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2019" (call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" x64) & (set QTDIR=C:\Qt\6.1\msvc2019_64) + if /i "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2019" (call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" x64) & (set QTDIR=C:\Qt\6.2\msvc2019_64) set path=%PATH%;%QTDIR%\bin echo QT Directory: %QTDIR% - echo Updated PATH: %PATH% - dir /b /a-d %QTDIR%\bin - + build_script: - cmd: >- nmake -f Makefile.nmake -nologo CFLAGS="-W3 -Os -MDd" From b18c179a8abbe2174b4ccebb899db5c75c5f2b5f Mon Sep 17 00:00:00 2001 From: Brian Date: Fri, 27 Oct 2023 13:29:16 +1100 Subject: [PATCH 9/9] Update .appveyor.yml --- .appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index 88c56f94..88042a54 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -8,7 +8,7 @@ install: - cmd: >- if /i "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2017" (call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" x86) & (set QTDIR=C:\Qt\5.13\msvc2017) - if /i "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2019" (call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" x64) & (set QTDIR=C:\Qt\6.2\msvc2019_64) + if /i "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2019" (call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" x64) & (set QTDIR=C:\Qt\6.5\msvc2019_64) set path=%PATH%;%QTDIR%\bin