Mercurial > evolve
changeset 6109:f196f76d8683
ci: move update-hg-repo.sh to testlib/
Moving the file from contrib/, which is skipped when building a tarball, means
we have one more file "appear" in test-check-sdist.t.
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Fri, 03 Dec 2021 09:37:51 +0300 |
| parents | ed68f64f5d0f |
| children | fc3ad54219d7 |
| files | .gitlab-ci.yml contrib/update-hg-repo.sh tests/test-check-sdist.t tests/testlib/update-hg-repo.sh |
| diffstat | 4 files changed, 13 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/.gitlab-ci.yml Tue Dec 07 21:05:42 2021 +0300 +++ b/.gitlab-ci.yml Fri Dec 03 09:37:51 2021 +0300 @@ -98,7 +98,7 @@ before_script: - C:/MinGW/msys/1.0/bin/sh.exe --login -c 'cd "$OLDPWD" && ls -1 tests/test-check-*.t > C:/Temp/check-tests.txt' script: - - C:/MinGW/msys/1.0/bin/sh.exe --login -c 'cd "$OLDPWD" && contrib/update-hg-repo.sh C:/Temp/hg' + - C:/MinGW/msys/1.0/bin/sh.exe --login -c 'cd "$OLDPWD" && tests/testlib/update-hg-repo.sh C:/Temp/hg' - > C:/MinGW/msys/1.0/bin/sh.exe --login -c ' cd "$OLDPWD" &&
--- a/contrib/update-hg-repo.sh Tue Dec 07 21:05:42 2021 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,8 +0,0 @@ -#!/bin/sh - -if hg root -R "$1"; then - hg pull -R "$1" -else - rm -rf "$1" - hg clone https://mirror.octobus.net/hg "$1" -fi
--- a/tests/test-check-sdist.t Tue Dec 07 21:05:42 2021 +0300 +++ b/tests/test-check-sdist.t Fri Dec 03 09:37:51 2021 +0300 @@ -35,7 +35,7 @@ $ tar -tzf hg-evolve-*.tar.gz | sed 's|^hg-evolve-[^/]*/||' | sort > files $ wc -l files - 353 files + 354 files $ fgrep debian files tests/test-check-debian.t $ fgrep __init__.py files
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/testlib/update-hg-repo.sh Fri Dec 03 09:37:51 2021 +0300 @@ -0,0 +1,11 @@ +#!/bin/sh +# Clone or update core Mercurial repo at the provided path. Useful for CI +# runners that don't have a shared repo setup, e.g. the shell runner that is +# currently used for Windows CI. + +if hg root -R "$1"; then + hg pull -R "$1" +else + rm -rf "$1" + hg clone https://mirror.octobus.net/hg "$1" +fi