Skip to content

Commit 3ff02d1

Browse files
avargitster
authored andcommitted
CI: remove unused Azure ci/* code
Remove Azure-specific code that's been unused since 6081d38 (ci: retire the Azure Pipelines definition, 2020-04-11). As noted in a larger removal of all of the Azure-supporting code in [1] (although that missed some of this) there is more of it in-tree, but let's focus on only the ci/* code for now. This is needed because in subsequent commits this unused code would either need to be changed to accommodate changes in ci/*, or be removed. As we'll see in those subsequent commits the end-state we're heading towards will actually make it easier to add new CI types in the future, even though the only one we're left with now is the GitHub CI. I.e. the "ci/*" framework will be made to do less, not more. We'll be offloading more of what it does to our generic build and test system. While I'm at it (since the line needs to be touched anyway) change an odd 'if test true == "$GITHUB_ACTIONS"' to the more usual style used in other places of 'if test "$GITHUB_ACTIONS" = "true"'. 1. https://lore.kernel.org/git/patch-1.1-eec0a8c3164-20211217T000418Z-avarab@gmail.com/ Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 291eb16 commit 3ff02d1

File tree

4 files changed

+2
-46
lines changed

4 files changed

+2
-46
lines changed

ci/install-dependencies.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,6 @@ macos-latest)
3434
export HOMEBREW_NO_AUTO_UPDATE=1 HOMEBREW_NO_INSTALL_CLEANUP=1
3535
# Uncomment this if you want to run perf tests:
3636
# brew install gnu-time
37-
test -z "$BREW_INSTALL_PACKAGES" ||
38-
brew install $BREW_INSTALL_PACKAGES
3937
brew link --force gettext
4038
brew install --cask --no-quarantine perforce || {
4139
# Update the definitions and try again
@@ -69,7 +67,6 @@ Documentation)
6967
sudo apt-get -q update
7068
sudo apt-get -q -y install asciidoc xmlto docbook-xsl-ns make
7169

72-
test -n "$ALREADY_HAVE_ASCIIDOCTOR" ||
7370
sudo gem install --version 1.5.8 asciidoctor
7471
;;
7572
linux-gcc-default)

ci/lib.sh

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -29,18 +29,7 @@ export TERM=${TERM:-dumb}
2929
# Clear MAKEFLAGS that may come from the outside world.
3030
export MAKEFLAGS=
3131

32-
if test -n "$SYSTEM_COLLECTIONURI" || test -n "$SYSTEM_TASKDEFINITIONSURI"
33-
then
34-
CI_TYPE=azure-pipelines
35-
# We are running in Azure Pipelines
36-
CC="${CC:-gcc}"
37-
38-
export GIT_PROVE_OPTS="--timer --jobs 10 --state=failed,slow,save"
39-
export GIT_TEST_OPTS="--verbose-log -x --write-junit-xml"
40-
MAKEFLAGS="$MAKEFLAGS --jobs=10"
41-
test Windows_NT != "$AGENT_OS" ||
42-
GIT_TEST_OPTS="--no-chain-lint --no-bin-wrappers $GIT_TEST_OPTS"
43-
elif test true = "$GITHUB_ACTIONS"
32+
if test "$GITHUB_ACTIONS" = "true"
4433
then
4534
CI_TYPE=github-actions
4635
CC="${CC:-gcc}"

ci/mount-fileshare.sh

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

ci/print-test-failures.sh

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,9 @@ do
3838
test_name="${TEST_EXIT%.exit}"
3939
test_name="${test_name##*/}"
4040
trash_dir="trash directory.$test_name"
41+
mkdir -p failed-test-artifacts
4142
case "$CI_TYPE" in
42-
azure-pipelines)
43-
mkdir -p failed-test-artifacts
44-
mv "$trash_dir" failed-test-artifacts
45-
continue
46-
;;
4743
github-actions)
48-
mkdir -p failed-test-artifacts
4944
echo "FAILED_TEST_ARTIFACTS=t/failed-test-artifacts" >>$GITHUB_ENV
5045
cp "${TEST_EXIT%.exit}.out" failed-test-artifacts/
5146
tar czf failed-test-artifacts/"$test_name".trash.tar.gz "$trash_dir"

0 commit comments

Comments
 (0)