Skip to content

Commit e42b0f9

Browse files
avargitster
avar
authored and
gitster
committed
CI: remove more dead Travis CI support
Remove code that I missed in 4a6e4b9 (CI: remove Travis CI support, 2021-11-23). This code was only called from or used by the now-removed .travis.yml, or needed by the Travis CI environment. For the symlinking in ci/run-build-and-tests.sh: Back when 3c93b82 (travis-ci: build Git during the 'script' phase, 2018-01-08) and 4b060a4 (ci: use a junction on Windows instead of a symlink, 2019-01-27) adjusted this "ln" command, the Windows build would use ci/run-build-and-tests.sh. As seen in 889cacb (ci: configure GitHub Actions for CI/PR, 2020-04-11) the current windows build uses a different entry point under the GitHub CI, which doesn't use this .prove caching. Namely "ci/run-test-slice.sh". We can be certain that it's never used in "ci/run-test-slice.sh" because to have a ".prove" file we'd need to use "--state=save", which we only do in the dead Azure codepath in ci/lib.sh. If it were used it would do the wrong thing, because the different test slices would each try to clobber the same "t/.prove" file. If a subsequent run then used the -"-state=failed,slow,save" it would defeat the purpose of "ci/run-test-slice.sh", since all slices would then run all tests. I.e. behavior of prove's "--state" options is to select tests to run from the provided "--state" file, in addition to those specified on the command-line. For ci/run-docker{,-build}.sh: It was likewise last referenced in the .travis.yml removed in my 4a6e4b9. The current "dockerized" run in ".github/workflows/main.yml" calls the same entry points as the main "regular" job. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent b901307 commit e42b0f9

File tree

7 files changed

+2
-184
lines changed

7 files changed

+2
-184
lines changed

‎ci/lib.sh‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -106,9 +106,6 @@ then
106106
CI_COMMIT="$BUILD_SOURCEVERSION"
107107
CI_JOB_ID="$BUILD_BUILDID"
108108
CI_JOB_NUMBER="$BUILD_BUILDNUMBER"
109-
CI_OS_NAME="$(echo "$AGENT_OS" | tr A-Z a-z)"
110-
test darwin != "$CI_OS_NAME" || CI_OS_NAME=osx
111-
CI_REPO_SLUG="$(expr "$BUILD_REPOSITORY_URI" : '.*/\([^/]*/[^/]*\)$')"
112109
CC="${CC:-gcc}"
113110

114111
# use a subdirectory of the cache dir (because the file share is shared
@@ -118,16 +115,13 @@ then
118115
export GIT_PROVE_OPTS="--timer --jobs 10 --state=failed,slow,save"
119116
export GIT_TEST_OPTS="--verbose-log -x --write-junit-xml"
120117
MAKEFLAGS="$MAKEFLAGS --jobs=10"
121-
test windows_nt != "$CI_OS_NAME" ||
118+
test Windows_NT != "$AGENT_OS" ||
122119
GIT_TEST_OPTS="--no-chain-lint --no-bin-wrappers $GIT_TEST_OPTS"
123120
elif test true = "$GITHUB_ACTIONS"
124121
then
125122
CI_TYPE=github-actions
126123
CI_BRANCH="$GITHUB_REF"
127124
CI_COMMIT="$GITHUB_SHA"
128-
CI_OS_NAME="$(echo "$RUNNER_OS" | tr A-Z a-z)"
129-
test macos != "$CI_OS_NAME" || CI_OS_NAME=osx
130-
CI_REPO_SLUG="$GITHUB_REPOSITORY"
131125
CI_JOB_ID="$GITHUB_RUN_ID"
132126
CC="${CC:-gcc}"
133127
DONT_SKIP_TAGS=t
@@ -137,7 +131,7 @@ then
137131
export GIT_PROVE_OPTS="--timer --jobs 10"
138132
export GIT_TEST_OPTS="--verbose-log -x"
139133
MAKEFLAGS="$MAKEFLAGS --jobs=10"
140-
test windows != "$CI_OS_NAME" ||
134+
test Windows != "$RUNNER_OS" ||
141135
GIT_TEST_OPTS="--no-chain-lint --no-bin-wrappers $GIT_TEST_OPTS"
142136
else
143137
echo "Could not identify CI type" >&2

‎ci/print-test-failures.sh‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,6 @@ do
7777
fi
7878
combined_trash_size=$new_combined_trash_size
7979

80-
# DO NOT modify these two 'echo'-ed strings below
81-
# without updating 'ci/util/extract-trash-dirs.sh'
82-
# as well.
8380
echo "$(tput setaf 1)Start of trash directory of '$test_name':$(tput sgr0)"
8481
cat "$trash_tgz_b64"
8582
echo "$(tput setaf 1)End of trash directory of '$test_name'$(tput sgr0)"

‎ci/run-build-and-tests.sh‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,6 @@
55

66
. ${0%/*}/lib.sh
77

8-
case "$CI_OS_NAME" in
9-
windows*) cmd //c mklink //j t\\.prove "$(cygpath -aw "$cache_dir/.prove")";;
10-
*) ln -s "$cache_dir/.prove" t/.prove;;
11-
esac
12-
138
export MAKE_TARGETS="all test"
149

1510
case "$jobname" in

‎ci/run-docker-build.sh‎

Lines changed: 0 additions & 66 deletions
This file was deleted.

‎ci/run-docker.sh‎

Lines changed: 0 additions & 47 deletions
This file was deleted.

‎ci/run-test-slice.sh‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,6 @@
55

66
. ${0%/*}/lib.sh
77

8-
case "$CI_OS_NAME" in
9-
windows*) cmd //c mklink //j t\\.prove "$(cygpath -aw "$cache_dir/.prove")";;
10-
*) ln -s "$cache_dir/.prove" t/.prove;;
11-
esac
12-
138
make --quiet -C t T="$(cd t &&
149
./helper/test-tool path-utils slice-tests "$1" "$2" t[0-9]*.sh |
1510
tr '\n' ' ')"

‎ci/util/extract-trash-dirs.sh‎

Lines changed: 0 additions & 50 deletions
This file was deleted.

0 commit comments

Comments
 (0)