windows-ci: clean up the Heptapod CI file now that the baseline is solid stable
authorRaphaël Gomès <rgomes@octobus.net>
Fri, 23 Jul 2021 10:45:08 +0200
branchstable
changeset 47801 d5d46dcd356b
parent 47800 8892f604e242
child 47802 bc74cb9a8e40
windows-ci: clean up the Heptapod CI file now that the baseline is solid Enough work has been done one the CI side, this now works with little effort on our side. The next patch will remove the manual switch. Differential Revision: https://phab.mercurial-scm.org/D11254
contrib/heptapod-ci.yml
--- a/contrib/heptapod-ci.yml	Tue Aug 03 21:22:02 2021 +0200
+++ b/contrib/heptapod-ci.yml	Fri Jul 23 10:45:08 2021 +0200
@@ -147,9 +147,7 @@
 .window_runtests_template: &windows_runtests
     stage: tests
     before_script:
-      # Temporary until this is adjusted in the environment
-      - $Env:TEMP="C:/Temp"
-      - $Env:TMP="C:/Temp"
+      - C:/MinGW/msys/1.0/bin/sh.exe --login -c 'cd "$OLDPWD" && ls -1 tests/test-check-*.* > C:/Temp/check-tests.txt'
       # TODO: find/install cvs, bzr, perforce, gpg, sqlite3
 
     script:
@@ -158,6 +156,8 @@
         - Invoke-Expression "$Env:PYTHON -V"
         - Invoke-Expression "$Env:PYTHON -m black --version"
         - echo "$Env:RUNTEST_ARGS"
+        - echo "$Env:TMP"
+        - echo "$Env:TEMP"
 
         - C:/MinGW/msys/1.0/bin/sh.exe --login -c 'cd "$OLDPWD" && HGTESTS_ALLOW_NETIO="$TEST_HGTESTS_ALLOW_NETIO" HGMODULEPOLICY="$TEST_HGMODULEPOLICY" $PYTHON tests/run-tests.py --color=always $RUNTEST_ARGS'
 
@@ -166,8 +166,7 @@
     when: manual
     tags:
       - windows
-    timeout: 2h
     variables:
         TEST_HGMODULEPOLICY: "c"
-        RUNTEST_ARGS: "--blacklist /tmp/check-tests.txt"
+        RUNTEST_ARGS: "--blacklist C:/Temp/check-tests.txt"
         PYTHON: py -3