Patchwork D11254: windows-ci: clean up the Heptapod CI file now that the baseline is solid

login
register
mail settings
Submitter phabricator
Date Aug. 5, 2021, 3:17 p.m.
Message ID <differential-rev-PHID-DREV-h3vinsoiy4pera44x7ye-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/49568/
State Superseded
Headers show

Comments

phabricator - Aug. 5, 2021, 3:17 p.m.
Alphare created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REVISION SUMMARY
  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.

REPOSITORY
  rHG Mercurial

BRANCH
  stable

REVISION DETAIL
  https://phab.mercurial-scm.org/D11254

AFFECTED FILES
  contrib/heptapod-ci.yml

CHANGE DETAILS




To: Alphare, #hg-reviewers
Cc: mercurial-patches, mercurial-devel

Patch

diff --git a/contrib/heptapod-ci.yml b/contrib/heptapod-ci.yml
--- a/contrib/heptapod-ci.yml
+++ b/contrib/heptapod-ci.yml
@@ -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