In a preceding step the "setvar" function was made to take a
"--build", "--test" or "--all" argument to indicate where the
variables it sets were used.
Let's make use of that by having the relevant parts of
".github/workflows/main.yml" invoke "ci/lib.sh" with those options.
By doing this the set of variables shown in build-only steps will be
fewer, which makes diagnosing anything going on there easier, as we
won't have to look at a deluge of e.g. GIT_TEST_* variables.
For the "pedantic" job (which has no test phase) we won't run the
"ci/lib.sh --test" step, which will be clearly visible as a skipped
step in the UX.
Since we'll now always run "--build" for "make" and "--test" for "make
test" we can stop setting the "fat" MAKEFLAGS entirely on the "test"
steps, i.e. the one with PYTHON_PATH, CC etc. These will all be
carried over from the earlier --build step.
That won't be true in the case of the "windows-test" and "vs-test"
jobs, since they run separately from the corresponding "build"
step. So we'll need to make sure that we have the --jobs=N argument
for those.
This doesn't matter that much, as we'll still have --jobs=N in
GIT_PROVE_OPTS. So the only thing we'll use it for is parallelism in
the t/Makefile before we get to running "prove". Still, it's good to
be consistent for good measure, and to run the t/Makefile itself in
parallel.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@xxxxxxxxx>
---
.github/workflows/main.yml | 21 ++++++++-------
ci/lib.sh | 52 +++++++++++++++++++++++++++++++++++---
2 files changed, 60 insertions(+), 13 deletions(-)
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 83e0aa1f469..bb62b4ff725 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -84,7 +84,7 @@ jobs:
steps:
- uses: actions/checkout@v2
- uses: git-for-windows/setup-git-for-windows-sdk@v1
- - run: ci/lib.sh
+ - run: ci/lib.sh --build
shell: bash
- name: build
shell: bash
@@ -122,7 +122,7 @@ jobs:
shell: bash
run: tar xf artifacts.tar.gz && tar xf tracked.tar.gz
- uses: git-for-windows/setup-git-for-windows-sdk@v1
- - run: ci/lib.sh
+ - run: ci/lib.sh --test
shell: bash
- name: select tests
run: . /etc/profile && ci/select-test-slice.sh ${{matrix.nr}} 10
@@ -169,7 +169,7 @@ jobs:
- name: copy dlls to root
shell: cmd
run: compat\vcbuild\vcpkg_copy_dlls.bat release
- - run: ci/lib.sh
+ - run: ci/lib.sh --build
shell: bash
- name: generate Visual Studio solution
shell: bash
@@ -211,7 +211,7 @@ jobs:
- name: extract tracked files and build artifacts
shell: bash
run: tar xf artifacts.tar.gz && tar xf tracked.tar.gz
- - run: ci/lib.sh
+ - run: ci/lib.sh --test
shell: bash
- name: select tests
run: . /etc/profile && ci/select-test-slice.sh ${{matrix.nr}} 10
@@ -275,8 +275,9 @@ jobs:
steps:
- uses: actions/checkout@v2
- run: ci/install-dependencies.sh
- - run: ci/lib.sh
+ - run: ci/lib.sh --build
- run: make
+ - run: ci/lib.sh --test
- run: make test
if: success()
- run: ci/print-test-failures.sh
@@ -310,8 +311,10 @@ jobs:
steps:
- uses: actions/checkout@v1
- run: ci/install-dependencies.sh
- - run: ci/lib.sh
+ - run: ci/lib.sh --build
- run: make
+ - run: ci/lib.sh --test
+ if: success() && matrix.vector.skip-tests != 'yes'
- run: make test
if: success() && matrix.vector.skip-tests != 'yes'
- run: ci/print-test-failures.sh
@@ -331,7 +334,7 @@ jobs:
steps:
- uses: actions/checkout@v2
- run: ci/install-dependencies.sh
- - run: ci/lib.sh
+ - run: ci/lib.sh --build
- run: make ci-static-analysis
sparse:
needs: ci-config
@@ -352,7 +355,7 @@ jobs:
- uses: actions/checkout@v2
- name: Install other dependencies
run: ci/install-dependencies.sh
- - run: ci/lib.sh
+ - run: ci/lib.sh --build
- run: make sparse
documentation:
name: documentation
@@ -364,7 +367,7 @@ jobs:
steps:
- uses: actions/checkout@v2
- run: ci/install-dependencies.sh
- - run: ci/lib.sh
+ - run: ci/lib.sh --build
- run: make check-docs
- run: "make doc > >(tee stdout.log) 2> >(tee stderr.raw >&2)"
shell: bash
diff --git a/ci/lib.sh b/ci/lib.sh
index 15a0011f6aa..96919882c11 100755
--- a/ci/lib.sh
+++ b/ci/lib.sh
@@ -4,6 +4,30 @@ set -ex
# Helper libraries
. ${0%/*}/lib-ci-type.sh
+# Parse options
+mode_build=
+mode_test=
+while test $# != 0
+do
+ case "$1" in
+ --build)
+ mode_build=t
+ ;;
+ --test)
+ mode_test=t
+ ;;
+ -*)
+ echo "error: invalid option: $1" >&2
+ exit 1
+ ;;
+ *)
+ echo "error: invalid argument: $1" >&2
+ exit 1
+ ;;
+ esac
+ shift
+done
+
# Starting assertions
if test -z "$jobname"
then
@@ -11,16 +35,28 @@ then
exit 1
fi
+if test "$mode_test$mode_build" != "t"
+then
+ echo "error: need one mode, e.g. --build or --test" >&2
+ exit 1
+fi
+
# Helper functions
setenv () {
while test $# != 0
do
case "$1" in
--build)
+ if test -z "$mode_build"
+ then
+ return 0
+ fi
;;
--test)
- ;;
- --all)
+ if test -z "$mode_test"
+ then
+ return 0
+ fi
;;
-*)
echo "BUG: bad setenv() option '$1'" >&2
@@ -46,8 +82,12 @@ setenv () {
# How many jobs to run in parallel?
NPROC=10
+# For "--test" we carry the MAKEFLAGS over from earlier steps, except
+# in stand-alone jobs which will use $COMMON_MAKEFLAGS.
+COMMON_MAKEFLAGS=--jobs=$NPROC
+
# Clear MAKEFLAGS that may come from the outside world.
-MAKEFLAGS=--jobs=$NPROC
+MAKEFLAGS=$COMMON_MAKEFLAGS
case "$CI_TYPE" in
github-actions)
@@ -101,6 +141,9 @@ windows-build)
setenv --build NO_PERL NoThanks
setenv --build ARTIFACTS_DIRECTORY artifacts
;;
+windows-test)
+ setenv --test MAKEFLAGS "$COMMON_MAKEFLAGS"
+ ;;
vs-build)
setenv --build NO_PERL NoThanks
setenv --build NO_GETTEXT NoThanks
@@ -117,6 +160,7 @@ vs-build)
;;
vs-test)
setenv --test NO_SVN_TESTS YesPlease
+ setenv --test MAKEFLAGS "$COMMON_MAKEFLAGS"
;;
linux-gcc)
setenv --test GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME main
@@ -162,4 +206,4 @@ linux-leaks)
;;
esac
-setenv --all MAKEFLAGS "$MAKEFLAGS CC=${CC:-cc}"
+setenv --build MAKEFLAGS "$MAKEFLAGS CC=${CC:-cc}"
--
2.36.1.1045.gf356b5617dd
