From e83b322f7f2c9e533319e250455bc12f752b4998 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= Date: Tue, 15 Oct 2019 20:49:08 +0200 Subject: [PATCH 1/2] Fix artifacts created by the "autoreconf" CI job The intended purpose of the "autoreconf:sid:amd64" GitLab CI job is to run "autoreconf -fi" and then pass the updated files on to subsequent non-Windows build jobs. However, the artifacts currently created by that job only include files which are not tracked by Git. Since we currently do track e.g. "configure" with Git, the aforementioned job is essentially a no-op. Fix by manually specifying the files generated by the "autoreconf:sid:amd64" job that should be passed on to subsequent build jobs. --- .gitlab-ci.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b9ec003c69..28ec20449e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -146,7 +146,11 @@ stages: script: - autoreconf -fi artifacts: - untracked: true + paths: + - aclocal.m4 + - configure + - ltmain.sh + - m4/libtool.m4 expire_in: "1 week" .configure: &configure | From dd97dfdc1447833d70da82493400c5b8a87f73f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= Date: Tue, 15 Oct 2019 20:49:08 +0200 Subject: [PATCH 2/2] Tweak dependencies for the Windows build job Since the Windows build job does not use the files created as a result of running "autoreconf -fi" in the "autoreconf:sid:amd64" job, set its dependencies to an empty list. Since it is currently not possible to use "needs: []" for jobs which do not belong to the first stage of a pipeline, set the "needs" key for the Windows build job to the "autoreconf:sid:amd64" job so that all build jobs are started at the same time (without this change, the Windows build job does not start until all jobs in the "precheck" stage are finished). As a side note, these changes also attempt to eliminate intermittent, bogus GitLab error messages ("There has been a missing dependency failure"). --- .gitlab-ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 28ec20449e..595f9f0378 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -838,6 +838,9 @@ msvc:windows:amd64: x64' - 'Set-Item -path "Env:CL" -value "/MP$([Math]::Truncate($BUILD_PARALLEL_JOBS/2))"' - '& msbuild.exe /maxCpuCount:2 /t:Build /p:Configuration=$VSCONF bind9.sln' + dependencies: [] + needs: + - autoreconf:sid:amd64 artifacts: untracked: true expire_in: "1 week"