ci: again common element into a `.windows` template stable
authorPierre-Yves David <pierre-yves.david@octobus.net>
Sat, 09 Nov 2024 23:36:30 +0100
branchstable
changeset 52226 b25fc1f25edf
parent 52225 a76dcb82148e
child 52227 f514c5acfdd6
ci: again common element into a `.windows` template This factor some code out and will help with introducing a new job about wheels.
contrib/heptapod-ci.yml
--- a/contrib/heptapod-ci.yml	Sat Nov 09 23:28:36 2024 +0100
+++ b/contrib/heptapod-ci.yml	Sat Nov 09 23:36:30 2024 +0100
@@ -275,14 +275,21 @@
 # is stored in OLDPWD.  Of the added variables, MSYSTEM is crucial to running
 # run-tests.py- it is needed to make run-tests.py generate a `python3` script
 # that satisfies the various shebang lines and delegates to `py -3`.
-.windows-runtests:
+
+.windows:
     extends: .all
     when: manual  # we don't have any Windows runners anymore at the moment
-    stage: platform-compat
+    tags:
+      - windows
     before_script:
       - C:/hgdev/MinGW/msys/1.0/bin/sh.exe --login -c 'cd "$OLDPWD" && ls -1 tests/test-check-*.* > "${TMP_WORK_DIR}"/check-tests.txt'
       # TODO: find/install cvs, bzr, perforce, gpg, sqlite3
+    variables:
+        PYTHON: C:/hgdev/venvs/python39-x64/Scripts/python.exe
 
+.windows-runtests:
+    extends: .windows
+    stage: platform-compat
     script:
         - echo "Entering script section"
         - echo "python used, $Env:PYTHON"
@@ -295,21 +302,14 @@
 
 windows:
     extends: .windows-runtests
-    when: manual
-    tags:
-      - windows
     variables:
         RUNTEST_ARGS: "-j 8 --blacklist ${TMP_WORK_DIR}/check-tests.txt"
-        PYTHON: C:/hgdev/venvs/python39-x64/Scripts/python.exe
 
 windows-pyox:
     extends: .windows-runtests
     when: manual  # pyoxidizer builds seem broken with --no-use-pep517
-    tags:
-      - windows
     variables:
         RUNTEST_ARGS: "--blacklist ${TMP_WORK_DIR}/check-tests.txt --pyoxidized"
-        PYTHON: C:/hgdev/venvs/python39-x64/Scripts/python.exe
 
 macos:
     extends: .test-c