Remove the already thin "ci/run-build-and-tests.sh" wrapper and
instead make the CI run "make" or "make test" directly. By doing this
we'll be able to easily see at a glance whether our failure was in the
compilation or testing, whether that's via human eyes or improve
machine readability.
We also need to run our new "ci/check-unignored-build-artifacts.sh" on
success() in the CI now, just like we already had a step conditional
on failure() running ci/print-test-failures.sh.
The reason we used a "ci/run-build-and-tests.sh" wrapper in the first
place had to do with Travis CI-specific constraints that no longer
apply to us, as the Travis CI support has been removed.
Instead we can configure the CI in an earlier step by running
"ci/lib.sh", which under GitHub CI will write the environment
variables we need to the "$GITHUB_ENV" file.
We'll then have access to them in subsequent steps, and crucially
those variables will be prominently visible at the start of each step
via an expandable drop-down in the UI.drop-do.
I.e. this changes the CI run from a top-down flow like (pseudocode):
- job:
- step1:
- use ci/lib.sh to set env vars
- run a script like ci/run-build-and-tests.sh
- step2:
- if: failure()
- use ci/lib.sh to set env vars
- run ci/print-test-failures.sh
To:
- job:
- step1:
- set variables in $GITHUB_ENV using ci/lib.sh
- step2:
- make
- step3:
- make test
- step4:
- if: failure()
- run ci/print-test-failures.sh
- step5:
- if: success()
- run ci/check-unignored-build-artifacts.sh
There is a proposal[2] to get some of the benefits of this approach by
not re-arranging our variable setup in this way, but to instead use
the GitHub CI grouping syntax to focus on the relevant parts of "make"
or "make test" when we have failures.
Doing it this way makes for better looking GitHub CI UI, and lays much
better ground work for our CI going forward. Because:
* The CI logic will be more portable to a future CI system, since a
common feature of them is to run various commands in sequence, but
a future system won't necessarily support the GitHub-specifics
syntax of "grouping" output within a "step".
Even if those systems don't support a "$GITHUB_ENV" emulating will
be much easier than to deal with some CI-specific grouping syntax.
* At the start of every step the GitHub CI presents an expandable
list of environment variables from "$GITHUB_ENV". We'll now see
exactly what variables affected that step (although we currently
overshoot that a bit, and always define all variables).
* CI failures will be easier to reproduce locally, as this makes the
relevant ci/* scripts something that sets up our environment, but
leaves "make" and "make test" working as they do locally.
To reproduce a run the user only needs to set the variables
discussed in the drop-down above, either manually or by running
"ci/lib.sh".
* The output will be less verbose. The "ci/lib.sh" script uses "set
-x", and before this e.g. "ci/static-analysis.sh" would start with
40 lines of trace output, culminating in using "export" to export
the relevant environment variables.
Now that verbosity is in the earlier "ci/lib.sh" step, and not in
any subsequent one. The "make" targets then start out with the
relevant non-trace output right away.
* If we do want to use the grouping syntax within a "step" it'll now
be easier to do so. It doesn't support nesting, so we'd have to
make a choice between using it for e.g. "make" v.s. "make test", or
individual test failures. See "sadly" in [3].
1. https://lore.kernel.org/git/211120.86k0h30zuw.gmgdl@xxxxxxxxxxxxxxxxxxx/
2. https://lore.kernel.org/git/pull.1117.git.1643050574.gitgitgadget@xxxxxxxxx/
3. https://lore.kernel.org/git/9333ba781b8240f704e739b00d274f8c3d887e39.1643050574.git.gitgitgadget@xxxxxxxxx/
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@xxxxxxxxx>
---
.github/workflows/main.yml | 14 ++++++--
ci/check-unignored-build-artifacts.sh | 8 +++++
ci/install-dependencies.sh | 4 +++
ci/lib.sh | 36 +++++++++++++++++++-
ci/make-test-artifacts.sh | 2 --
ci/run-build-and-tests.sh | 47 ---------------------------
ci/run-test-slice.sh | 2 --
ci/test-documentation.sh | 1 -
8 files changed, 58 insertions(+), 56 deletions(-)
create mode 100755 ci/check-unignored-build-artifacts.sh
delete mode 100755 ci/run-build-and-tests.sh
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index ad752010102..57b2db06923 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -268,7 +268,10 @@ jobs:
steps:
- uses: actions/checkout@v2
- run: ci/install-dependencies.sh
- - run: ci/run-build-and-tests.sh
+ - run: ci/lib.sh
+ - run: make
+ - run: make test
+ if: success()
- run: ci/print-test-failures.sh
if: failure()
- name: Upload failed tests' directories
@@ -292,6 +295,7 @@ jobs:
image: daald/ubuntu32:xenial
- jobname: pedantic
image: fedora
+ skip-tests: yes
env:
jobname: ${{matrix.vector.jobname}}
runs-on: ubuntu-latest
@@ -299,9 +303,12 @@ jobs:
steps:
- uses: actions/checkout@v1
- run: ci/install-docker-dependencies.sh
- - run: ci/run-build-and-tests.sh
+ - run: ci/lib.sh
+ - run: make
+ - run: make test
+ if: success() && matrix.vector.skip-tests != 'yes'
- run: ci/print-test-failures.sh
- if: failure()
+ if: failure() && matrix.vector.skip-tests != 'yes'
- name: Upload failed tests' directories
if: failure() && env.FAILED_TEST_ARTIFACTS != ''
uses: actions/upload-artifact@v1
@@ -317,6 +324,7 @@ jobs:
steps:
- uses: actions/checkout@v2
- run: ci/install-dependencies.sh
+ - run: ci/lib.sh
- run: make ci-static-analysis
sparse:
needs: ci-config
diff --git a/ci/check-unignored-build-artifacts.sh b/ci/check-unignored-build-artifacts.sh
new file mode 100755
index 00000000000..56d04b0db9a
--- /dev/null
+++ b/ci/check-unignored-build-artifacts.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+#
+# Check whether the build created anything not in our .gitignore
+#
+
+. ${0%/*}/lib.sh
+
+check_unignored_build_artifacts
diff --git a/ci/install-dependencies.sh b/ci/install-dependencies.sh
index 41a9185bb1e..5d50604e724 100755
--- a/ci/install-dependencies.sh
+++ b/ci/install-dependencies.sh
@@ -22,6 +22,10 @@ ubuntu-latest)
P4_PATH="$HOME/custom/p4"
GIT_LFS_PATH="$HOME/custom/git-lfs"
export PATH="$GIT_LFS_PATH:$P4_PATH:$PATH"
+ if test -n "$GITHUB_PATH"
+ then
+ echo "$PATH" >>"$GITHUB_PATH"
+ fi
P4WHENCE=https://cdist2.perforce.com/perforce/r$LINUX_P4_VERSION
LFSWHENCE=https://github.com/github/git-lfs/releases/download/v$LINUX_GIT_LFS_VERSION
diff --git a/ci/lib.sh b/ci/lib.sh
index 71e6d6e08e7..d18ee1a91e7 100755
--- a/ci/lib.sh
+++ b/ci/lib.sh
@@ -1,3 +1,5 @@
+#!/bin/sh
+
# Library of functions shared by all CI scripts
# Set 'exit on error' for all CI scripts to let the caller know that
@@ -39,7 +41,10 @@ setenv () {
val=$2
shift 2
- eval "export $key=\"$val\""
+ if test -n "$GITHUB_ENV"
+ then
+ echo "$key=$val" >>"$GITHUB_ENV"
+ fi
}
check_unignored_build_artifacts ()
@@ -109,6 +114,35 @@ macos-latest)
esac
case "$jobname" in
+linux-gcc)
+ setenv --test GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME main
+ ;;
+linux-TEST-vars)
+ setenv --test GIT_TEST_SPLIT_INDEX yes
+ setenv --test GIT_TEST_MERGE_ALGORITHM recursive
+ setenv --test GIT_TEST_FULL_IN_PACK_ARRAY true
+ setenv --test GIT_TEST_OE_SIZE 10
+ setenv --test GIT_TEST_OE_DELTA_SIZE 5
+ setenv --test GIT_TEST_COMMIT_GRAPH 1
+ setenv --test GIT_TEST_COMMIT_GRAPH_CHANGED_PATHS 1
+ setenv --test GIT_TEST_MULTI_PACK_INDEX 1
+ setenv --test GIT_TEST_MULTI_PACK_INDEX_WRITE_BITMAP 1
+ setenv --test GIT_TEST_ADD_I_USE_BUILTIN 1
+ setenv --test GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME master
+ setenv --test GIT_TEST_WRITE_REV_INDEX 1
+ setenv --test GIT_TEST_CHECKOUT_WORKERS 2
+ ;;
+linux-clang)
+ setenv --test GIT_TEST_DEFAULT_HASH sha1
+ ;;
+linux-sha256)
+ setenv --test GIT_TEST_DEFAULT_HASH sha256
+ ;;
+pedantic)
+ # Don't run the tests; we only care about whether Git can be
+ # built.
+ setenv --build DEVOPTS pedantic
+ ;;
linux32)
CC=gcc
;;
diff --git a/ci/make-test-artifacts.sh b/ci/make-test-artifacts.sh
index 646967481f6..45298562982 100755
--- a/ci/make-test-artifacts.sh
+++ b/ci/make-test-artifacts.sh
@@ -8,5 +8,3 @@ mkdir -p "$1" # in case ci/lib.sh decides to quit early
. ${0%/*}/lib.sh
make artifacts-tar ARTIFACTS_DIRECTORY="$1"
-
-check_unignored_build_artifacts
diff --git a/ci/run-build-and-tests.sh b/ci/run-build-and-tests.sh
deleted file mode 100755
index 35d45a9373e..00000000000
--- a/ci/run-build-and-tests.sh
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/sh
-#
-# Build and test Git
-#
-
-. ${0%/*}/lib.sh
-
-export MAKE_TARGETS="all test"
-
-case "$jobname" in
-linux-gcc)
- setenv --test GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME main
- ;;
-linux-TEST-vars)
- setenv --test GIT_TEST_SPLIT_INDEX yes
- setenv --test GIT_TEST_MERGE_ALGORITHM recursive
- setenv --test GIT_TEST_FULL_IN_PACK_ARRAY true
- setenv --test GIT_TEST_OE_SIZE 10
- setenv --test GIT_TEST_OE_DELTA_SIZE 5
- setenv --test GIT_TEST_COMMIT_GRAPH 1
- setenv --test GIT_TEST_COMMIT_GRAPH_CHANGED_PATHS 1
- setenv --test GIT_TEST_MULTI_PACK_INDEX 1
- setenv --test GIT_TEST_MULTI_PACK_INDEX_WRITE_BITMAP 1
- setenv --test GIT_TEST_ADD_I_USE_BUILTIN 1
- setenv --test GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME master
- setenv --test GIT_TEST_WRITE_REV_INDEX 1
- setenv --test GIT_TEST_CHECKOUT_WORKERS 2
- ;;
-linux-clang)
- setenv --test GIT_TEST_DEFAULT_HASH sha1
- ;;
-linux-sha256)
- setenv --test GIT_TEST_DEFAULT_HASH sha256
- ;;
-pedantic)
- # Don't run the tests; we only care about whether Git can be
- # built.
- setenv --build DEVOPTS pedantic
- export MAKE_TARGETS=all
- ;;
-esac
-
-# Any new "test" targets should not go after this "make", but should
-# adjust $MAKE_TARGETS. Otherwise compilation-only targets above will
-# start running tests.
-make $MAKE_TARGETS
-check_unignored_build_artifacts
diff --git a/ci/run-test-slice.sh b/ci/run-test-slice.sh
index b9a682b4bcd..70326961454 100755
--- a/ci/run-test-slice.sh
+++ b/ci/run-test-slice.sh
@@ -8,5 +8,3 @@
make --quiet -C t T="$(cd t &&
./helper/test-tool path-utils slice-tests "$1" "$2" t[0-9]*.sh |
tr '\n' ' ')"
-
-check_unignored_build_artifacts
diff --git a/ci/test-documentation.sh b/ci/test-documentation.sh
index 41e2b126311..6b5cce03bd7 100755
--- a/ci/test-documentation.sh
+++ b/ci/test-documentation.sh
@@ -39,4 +39,3 @@ test -s Documentation/git.html
grep '<meta name="generator" content="Asciidoctor ' Documentation/git.html
rm -f stdout.log stderr.log stderr.raw
-check_unignored_build_artifacts
--
2.36.1.1045.gf356b5617dd
