diff options
| author | Patrick Steinhardt <psteinhardt@gitlab.com> | 2021-04-29 10:08:06 +0300 |
|---|---|---|
| committer | Patrick Steinhardt <psteinhardt@gitlab.com> | 2021-04-29 10:08:06 +0300 |
| commit | fd0a308aefcbe192f46231bbaa0564eeb035da42 (patch) | |
| tree | a6d51e846029c23198071d152729921fe639d8f4 | |
| parent | 08a0862854886c544c4d0310b3c2b9800af5ddc6 (diff) | |
ci: Fix binaries job being broken by missing Makefile target
With commit 5bf73d7a0 (Makefile: Drop assembly targets, 2021-04-28),
we've dropped both the assemble targets and the binaries target which
uses them. While the commit (probably validly) claims that no downstream
distributions or documentation use those targets, it was overlooked that
Gitaly itself does use it: when creating tags, the "binaries" CI job
compiles Gitaly with `make binaries` and then makes resulting binaries
available as artifacts, which is now broken.
Instead of bringing back the assemble targets, this commit instead
implements the job on top of `make build`: it does the same than `make
binaries` did, with the minor difference that the directory where
binaries end up in changes and that we don't create checksums.
Checksumming is thus now moved into CI and paths are adjusted to
accomodate for those changes.
| -rw-r--r-- | .gitlab-ci.yml | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 187a2158f..8068525a3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -129,11 +129,12 @@ binaries: script: # Just in case we start running CI builds on other architectures in future - go version - - make binaries + - make build + - cd _build && sha256sum bin/* | tee checksums.sha256.txt artifacts: paths: - - _build/assembly/checksums.sha256.txt - - _build/assembly/bin/ + - _build/checksums.sha256.txt + - _build/bin/ name: "${CI_JOB_NAME}:go-${GO_VERSION}-git-${GIT_VERSION}" expire_in: 6 months parallel: |