Commit 13c9ff79 authored by Tomas Krizek's avatar Tomas Krizek

Merge branch 'release-4-2-2' into 'master'

release 4.2.2

See merge request !875
parents d8518ba6 713f13b6
Pipeline #53805 passed with stages
in 24 minutes and 21 seconds
......@@ -234,48 +234,6 @@ lint:tidy:
script:
- ninja -C build_ci* tidy
.pkgbuild: &pkgbuild
stage: test
except:
refs:
- master
variables:
- $SKIP_CI == "1"
image: $CI_REGISTRY/knot/knot-resolver/ci/fedora
only: # trigger job only in repos under our control
- branches@knot/knot-resolver
- branches@knot/knot-resolver-security
dependencies:
- archive
artifacts:
when: always
paths:
- epel-7-x86_64/
- fedora-29-x86_64/
- "*.src.rpm"
tags:
- privileged # mock requires additional capabilities (e.g. mount)
retry:
max: 1
when:
- script_failure
pkg:epel-7:
<<: *pkgbuild
script:
- ./scripts/make-srpm.sh
- mock --no-clean --dnf --old-chroot -r epel-7-x86_64 --rebuild *.src.rpm || (cat /var/lib/mock/epel-7-x86_64/result/build.log; false)
after_script:
- mv /var/lib/mock/epel-7-x86_64/result epel-7-x86_64
pkg:fedora-29:
<<: *pkgbuild
script:
- ./scripts/make-srpm.sh
- mock --no-clean --old-chroot -r fedora-29-x86_64 --rebuild *.src.rpm || (cat /var/lib/mock/fedora-29-x86_64/result/build.log; false)
after_script:
- mv /var/lib/mock/fedora-29-x86_64/result fedora-29-x86_64
respdiff:basic:
<<: *test
dependencies:
......
Knot Resolver 4.2.2 (2019-10-dd)
Knot Resolver 4.2.2 (2019-10-07)
================================
Bugfixes
......
......@@ -11,13 +11,6 @@ $ docker login registry.labs.nic.cz
$ docker push registry.labs.nic.cz/knot/knot-resolver/ci/debian-buster:knot-$KNOT_BRANCH
```
* fedora
```
$ docker build --no-cache -t registry.labs.nic.cz/knot/knot-resolver/ci/fedora fedora
$ docker push registry.labs.nic.cz/knot/knot-resolver/ci/fedora
```
* turris
```
......
FROM fedora:29
WORKDIR "/tmp"
CMD ["/bin/bash"]
RUN dnf install -y mock rpkg git
# for scripts/make-distrofiles.sh
RUN dnf install -y dpkg-dev perl-Digest-*
# add OBS repo with Knot DNS to mock
RUN curl -Lo obs-epel7.repo 'https://download.opensuse.org/repositories/home:CZ-NIC:knot-resolver-testing/CentOS_7_EPEL/home:CZ-NIC:knot-resolver-testing.repo'
RUN sed -i -e "/^config_opts\[.yum.conf.]/r obs-epel7.repo" /etc/mock/epel-7-x86_64.cfg
RUN curl -Lo obs-fedora.repo 'https://download.opensuse.org/repositories/home:CZ-NIC:knot-resolver-testing/Fedora_29/home:CZ-NIC:knot-resolver-testing.repo'
RUN sed -i -e "/^config_opts\[.yum.conf.]/r obs-fedora.repo" /etc/mock/fedora-29-x86_64.cfg
# cache packages in mock to speed up CI tests
# This would require privileged build: https://github.com/moby/moby/issues/1916
# RUN dnf download --source knot-resolver
# RUN mock --no-clean --dnf --old-chroot -r epel-7-x86_64 --rebuild knot-resolver-*.src.rpm
# RUN mock --no-clean --old-chroot -r fedora-29-x86_64 --rebuild knot-resolver-*.src.rpm
# RUN rm *.src.rpm
......@@ -2,7 +2,7 @@ project(
'knot-resolver',
['c', 'cpp'],
license: 'GPLv3+',
version: '4.2.1',
version: '4.2.2',
default_options: ['c_std=gnu11', 'b_ndebug=if-release'],
meson_version: '>=0.46',
)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment