Remove the $jobname fallback last adjusted in b011fabd6e0 (ci/lib.sh:
encapsulate Travis-specific things, 2019-01-27).
This makes all of our CI jobs have an explicit $jobname, and removes
the special-case of the Windows jobs implicitly setting one (that they
don't currently use). In subsequent commits we'll use this new
$jobname explicitly.
This is a follow-up to my 25715419bf4 (CI: don't run "make test" twice
in one job, 2021-11-23), since then all the jobs except the Windows
jobs have had an explicit $jobname.
In the case of the Windows jobs we were using a jobname of windows-gcc
for both, due to picking "gcc" as a default fallback for "$CC" in
ci/lib.sh.
Since we'll need this to run ci/lib.sh it makes sense to move the
check to the top of the file. Subsequent commits will add more such
assertions to it.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@xxxxxxxxx>
---
.github/workflows/main.yml | 8 ++++++++
ci/lib.sh | 12 +++++++-----
2 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index c35200defb9..309b9141249 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -79,6 +79,8 @@ jobs:
windows-build:
name: win build
+ env:
+ jobname: windows-build
needs: ci-config
if: needs.ci-config.outputs.enabled == 'yes'
runs-on: windows-latest
@@ -100,6 +102,8 @@ jobs:
path: artifacts
windows-test:
name: win test
+ env:
+ jobname: windows-test
runs-on: windows-latest
needs: [windows-build]
strategy:
@@ -131,6 +135,8 @@ jobs:
path: ${{env.FAILED_TEST_ARTIFACTS}}
vs-build:
name: win+VS build
+ env:
+ jobname: vs-build
needs: ci-config
if: needs.ci-config.outputs.enabled == 'yes'
env:
@@ -183,6 +189,8 @@ jobs:
path: artifacts
vs-test:
name: win+VS test
+ env:
+ jobname: vs-test
runs-on: windows-latest
needs: vs-build
strategy:
diff --git a/ci/lib.sh b/ci/lib.sh
index 57141d38a85..d2a7c33f536 100755
--- a/ci/lib.sh
+++ b/ci/lib.sh
@@ -6,6 +6,13 @@
# and installing dependencies.
set -ex
+# Starting assertions
+if test -z "$jobname"
+then
+ echo "must set a CI jobname" >&2
+ exit 1
+fi
+
skip_branch_tip_with_tag () {
# Sometimes, a branch is pushed at the same time the tag that points
# at the same commit as the tip of the branch is pushed, and building
@@ -146,11 +153,6 @@ test -n "${DONT_SKIP_TAGS-}" ||
skip_branch_tip_with_tag
skip_good_tree
-if test -z "$jobname"
-then
- jobname="$CI_OS_NAME-$CC"
-fi
-
export DEVELOPER=1
export DEFAULT_TEST_TARGET=prove
export GIT_TEST_CLONE_2GB=true
--
2.35.1.1517.g20a06c426a7
