diff options
| author | Gerald Combs <gerald@wireshark.org> | 2021-01-08 11:04:00 -0800 |
|---|---|---|
| committer | Wireshark GitLab Utility <gerald+gitlab-utility@wireshark.org> | 2021-01-09 19:16:16 +0000 |
| commit | 0d820ddc8d2dde1070c312093699cc34623c36c5 (patch) | |
| tree | 0a023b0cb3d5c2e963896a24d06e33b51291209d /.gitlab-ci.yml | |
| parent | 9b0c3f5eaf2d91596b1c6769b7e44666a641fa07 (diff) | |
Packaging+GitLab CI: Dist tarball updates.
Ninja keeps track of its built files in .ninja_log, so if you copy a
pre-built target into a fresh build directory, Ninja will ignore and
overwrite it. This includes the tarball generated by the 'dist' target.
In get-export-release.sh, check for a preexisting tarball and preserve
it by default. This lets us pass the dist tarball from one GitLab CI
stage to other stages without recreating it. It's also arguably the
right thing to do in general, since we record and publish the tarball
hashes for each release and different contents for the same filename can
cause confusion.
Move the dist tarball to the build directory in .gitlab-ci.yml, and add
a note about using the tarball exclusively.
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 57a051d8dc..fca8abb2b5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -62,11 +62,14 @@ variables: .build-rpm: extends: .build before_script: + # It might make sense to set "GIT_STRATEGY: none" and build from + # the tarball. - git config --global user.email "you@example.com" - git config --global user.name "Your Name" - mkdir build - cd build - perl ../tools/make-version.pl --set-release + - mv -v ../wireshark-*.tar.* . artifacts: paths: - build/packaging/rpm/RPMS |