diff options
| author | Aleš Mrázek <ales.mrazek@nic.cz> | 2024-03-27 17:38:30 +0100 |
|---|---|---|
| committer | Aleš Mrázek <ales.mrazek@nic.cz> | 2024-03-27 17:38:30 +0100 |
| commit | 284aaacd9a1b48709eba65b5a668ec7f9e9a039c (patch) | |
| tree | ec5d9954b56d35110659263bf00e5347fa87c9d5 | |
| parent | Merge branch 'time_t' into 'master' (diff) | |
| parent | ci: obs: create venv and install apkg (diff) | |
| download | knot-resolver-284aaacd9a1b48709eba65b5a668ec7f9e9a039c.tar.xz knot-resolver-284aaacd9a1b48709eba65b5a668ec7f9e9a039c.zip | |
Merge branch 'release-5.7.2' into 'master'v5.7.2
Release 5.7.2
See merge request knot/knot-resolver!1522
| -rw-r--r-- | .gitlab-ci.yml | 4 | ||||
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | meson.build | 2 | ||||
| -rwxr-xr-x | scripts/update-authors.sh | 2 |
4 files changed, 7 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cf7b7120..6cc1f9da 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -542,6 +542,10 @@ obs:trigger: &obs_trigger - condor allow_failure: false # required to make when: manual action blocking script: + - python3 -m venv ./venv + - source ./venv/bin/activate + - pip install --upgrade pip + - pip install apkg - scripts/make-obs.sh - echo y | scripts/build-in-obs.sh $OBS_REPO @@ -1,4 +1,4 @@ -Knot Resolver 5.7.2 (2024-0m-dd) +Knot Resolver 5.7.2 (2024-03-27) ================================ Bugfixes diff --git a/meson.build b/meson.build index 12c5eb3e..8e22e17b 100644 --- a/meson.build +++ b/meson.build @@ -4,7 +4,7 @@ project( 'knot-resolver', ['c', 'cpp'], license: 'GPLv3+', - version: '5.7.1', + version: '5.7.2', default_options: ['c_std=gnu11', 'b_ndebug=true'], meson_version: '>=0.49', ) diff --git a/scripts/update-authors.sh b/scripts/update-authors.sh index fe1d8579..a2ddc277 100755 --- a/scripts/update-authors.sh +++ b/scripts/update-authors.sh @@ -15,7 +15,7 @@ TEMP_FILE="$(mktemp AUTHORS.XXXXXXXXXX)" # drop all names from the current file sed '/^People who contributed commits to our Git repo are/q' "${AUTHORS_FILE}" > "${TEMP_FILE}" # append to the new file -git log --format="%aN <%aE>" | sort -u | git check-mailmap --stdin | sort -u >> "${TEMP_FILE}" +git log --no-show-signature --format="%aN <%aE>" | sort -u | git check-mailmap --stdin | sort -u >> "${TEMP_FILE}" echo '' >> "${TEMP_FILE}" echo 'Knot Resolver source tree also bundles code and content published by:' >> "${TEMP_FILE}" |