From 27ed4d063720162552a45f78d2fabe06bf9d7921 Mon Sep 17 00:00:00 2001 From: Baptiste Grenier Date: Wed, 23 Sep 2020 15:57:33 +0200 Subject: [PATCH] Prepare 5.5.26 (#23) * Prepare release 5.5.26 * README: Document release process * Update AUTHORS * travis: get GITHUB_TOKEN from environment --- .travis.yml | 4 ++-- AUTHORS | 6 +++++- README.md | 23 +++++++++++++++++------ bdii.spec | 7 ++++++- debian/changelog | 8 ++++++++ 5 files changed, 38 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index d30ec22..3999ac3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -43,8 +43,8 @@ script: - docker exec -i -w /src/build/RPMS/noarch install_container sh -c "yum localinstall -y bdii*.el${OS_MAJOR_VERSION}.noarch.rpm" deploy: provider: releases - api_key: - secure: tw560GrnanaDUSQ27wmyn+tryv7NYwvKjafc23VWpJRw78BYrIZopAL3r/YN9k7iQmk0WyJ7pjV3ayL/XSW0vYhCme1hpKaKTrRl8r+C4pJcmz9q50bVE1G2invgiqiw2Tpne7BG/LS7aERQxPs2tgmzvoy0XLFgoWOec+cBts5D+KtAnOZ5jxob6V9K1na79pK9OK4mVt/rYeuqEb8O44tjHywa7PWzg9mHAtzAGLtrgki3ICEosFkqRyBaQmwbLc/fUhA1De9TtGtbxaQ3GYRCIgnQTJ5DNOcuj3X21WlXGhQXEovR1oC3lBwMPxx2Ap1Ke3JNIU9y8YiW7CGqQm8XV9wm5PFN6O2ZccjPRVp+xkGkl0w1+RL/Ms2zfevFaxztqzKCt+AVXDw4aQrxyawuNCRLku3uzzQa0cQPfJscWHAqLCTXSP13hbKyyu+nvVFBpMjY6xO8TICHeb5dXVOU1JIw6Qu+AqfEIYZQsNuJI6SUwkkonHrRZ0iEfLi+0JQ8adelGqCfDiK7bDSFQ4prjLECjjp3HHSrvvcRNl8gEc+0P/qdWsIdC8j1a332f3VsO3JF/8+NWjU2Uy8fs04DyzWM4l3Ccg+7DEfx/zdPWCwlzNq6giByMiDm0RvPgrNVigdN8o6QnVOxkpeL4lNnOVfIb/RtJq4ND3zKvOE= + # Set in the settings page of the repository, as an environment variable + api_key: $GITHUB_TOKEN file_glob: true file: - build/RPMS/noarch/bdii*.el${OS_MAJOR_VERSION}.noarch.rpm diff --git a/AUTHORS b/AUTHORS index 3b80c77..e2e9196 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,6 +1,5 @@ Maintainers ----------- -Paolo Andreetto Baptiste Grenier Original Authors @@ -15,3 +14,8 @@ Maarten Litmaath Felix Ehm Andrew Elwell Daniel Johansson +Paolo Andreetto +Petr Vokac https://github.com/vokac +Andrea Manzi +Mattias Ellert +Enol Fernández diff --git a/README.md b/README.md index fe1c5f9..3fca02e 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ Whenever a remote server is contacted and the ldapsearch command times out the update process tries to find an (old) cached entry in the `/var/cache/` directory. If no entry is found a message is printed to the logfile. -*Attention!* +_Attention!_ If the remote host cannot be contacted due to a connection problem no cached entry is taken. No message is printed to the logfile. @@ -58,8 +58,8 @@ The description of thoese metrics can be found in the etc/BDII.schema file. make install ``` -* Build dependencies: None -* Runtime dependencies: openldap +- Build dependencies: None +- Runtime dependencies: openldap ## Building packages @@ -67,9 +67,9 @@ make install The required build dependencies are: -* rpm-build -* make -* rsync +- rpm-build +- make +- rsync ```sh # Checkout tag to be packaged @@ -100,6 +100,17 @@ cd /source && make deb The DEB will be available into the `build/` directory. +## Preparing a release + +- Prepare a changelog from the last version, including contributors' names +- Prepare a PR with + - Updating version and changelog in `bdii.spec` + - Updating version and changelog in `debian/changelog` + - Updating authors in `AUTHORS` + - Updating `codemeta.json` if needed +- Once the PR has been merged tag and release a new version in GitHub + - Packages will be built using Travis and attached to the release page + ## History This work started under the EGEE project, and was hosted and maintained for a diff --git a/bdii.spec b/bdii.spec index cfb8853..5fdbc9e 100644 --- a/bdii.spec +++ b/bdii.spec @@ -1,5 +1,5 @@ Name: bdii -Version: 5.2.25 +Version: 5.2.26 Release: 1%{?dist} Summary: The Berkeley Database Information Index (BDII) @@ -122,6 +122,11 @@ fi %changelog +* Wed Sep 23 2020 Baptiste Grenier - 5.2.26-1 +- Truncate LDIF password file before updating (Petr Vokac) +- Preserve base64 entries (Enol Fernández, Andrea Manzi) +- Allow BDII_HOSTNAME configuration and default to localhost (Andrea Manzi) + * Tue Oct 2 2018 Baptiste Grenier - 5.2.25-1 - Import product card JSON in codemeta.json format (Bruce Becker) - Lint, build, test install and attach packages to GitHub tags using Travis. (Baptiste Grenier) diff --git a/debian/changelog b/debian/changelog index df6bd79..5a5dd23 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +bdii (5.2.26-1) UNRELEASED; urgency=low + + * Truncate LDIF password file before updating (Petr Vokac) + * Preserve base64 entries (Enol Fernández, Andrea Manzi) + * Allow BDII_HOSTNAME configuration and default to localhost (Andrea Manzi) + + -- Baptiste Grenier Wed, 23 Sep 2020 11:02:00 +0100 + bdii (5.2.24-1) UNRELEASED; urgency=low * Fix #3: init script failing on stale PID (Paolo Andreetto)