fix: dev: still more msvc bat cleanup, update workflowos

* setup python and use tox in smoke.yml, add mising exclude in ci.yml * need to skip missing installer section in build_msvc.bat Signed-off-by: Stephen L Arnold <[email protected]>
sarnold · Nov 17, 2022 · aa40041 · aa40041
1 parent 264ee5d
commit aa40041
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 11 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -81,7 +81,7 @@ jobs:
           make
 
       - name: Install and setup msvc prompt
-        if: runner.os == 'Windows'
+        if: runner.os == 'Windows' &&  matrix.compiler == 'cl'
         uses: ilammy/msvc-dev-cmd@v1
 
       - name: Build and test windows MSVC

diff --git a/.github/workflows/smoke.yml b/.github/workflows/smoke.yml
@@ -29,12 +29,18 @@ jobs:
         which gcc
       if: startsWith(matrix.os, 'win')
 
-    - name: build
-      run: make cccc
+    - uses: actions/setup-python@v4
+      with:
+        python-version: '3.9'
+
+    - name: Add requirements
+      run: |
+        python -m pip install --upgrade pip
+        pip install tox
 
-    - name: run test
+    - name: Build and test
       run: |
-        make test
+        tox -e build
 
   windows:
     runs-on: windows-2019

diff --git a/build_msvc.bat b/build_msvc.bat
@@ -144,8 +144,10 @@ call run_test java  prn13
 call run_test java  prn14
 call run_test java  prn15
 call run_test java  prn16
+echo All tests passed
 cd ..
 endlocal
+if not exist "c:\Program Files\My Inno Setup Extensions\iscc.exe" goto :end
 
 rem The visual C++ addin can't be built using MS Visual C++ Toolkit 2003
 rem because it doesn't provide MFC header files and libraries
@@ -184,10 +186,4 @@ echo Please rerun the script with the argument --clean to build these binaries.
 goto :end
 
 
-
 :end
-
-
-
-
-