diff options
| author | Gerald Combs <gerald@wireshark.org> | 2022-02-10 11:17:23 -0800 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2022-02-13 13:21:58 -0800 |
| commit | 79da670bd1b4f91eebee5c96b19eaf1f33c94777 (patch) | |
| tree | e5089f650f8c52aa9710ed71ca1891c9fcbbff58 /.gitlab-ci.yml | |
| parent | 4e3b2ec007872ffe13ffb2b0b3236a227d358ace (diff) | |
Packaging+GitLab CI: Move debian to the packaging directory.
We keep our various packaging assets in the "packaging" directory. Move
the Debian assets there. dpkg-buildpackage doesn't seem appear to have a
"debian directory path" option, but symlinking worked in my test
container.
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6688b47b26..fefa715a65 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -221,6 +221,7 @@ Debian Stable APT Package: rules: !reference [.if-merged] image: registry.gitlab.com/wireshark/wireshark-containers/debian-stable-dev script: + - ln --symbolic --no-dereference --force packaging/debian - perl tools/make-version.pl --set-release # Shared GitLab runners limit the log size to 4M, so reduce verbosity. See # https://gitlab.com/gitlab-com/support-forum/issues/2790 @@ -303,6 +304,7 @@ Ubuntu APT Package: script: # build-ubuntu puts us in `build`. - cd .. + - ln --symbolic --no-dereference --force packaging/debian - CC=/usr/lib/ccache/gcc CXX=/usr/lib/ccache/g++ MAKE=ninja dpkg-buildpackage -us -uc -rfakeroot -jauto -Zgzip -zfast - mkdir ubuntu-packages - mv ../*.deb ubuntu-packages/ |