From 3812432dc21c32d609aa96474bed44e4f4be6b0b Mon Sep 17 00:00:00 2001 From: TomSweeneyRedHat Date: Tue, 7 Apr 2020 16:01:45 -0400 Subject: [PATCH 1/2] Bump to v1.14.7 Signed-off-by: TomSweeneyRedHat --- CHANGELOG.md | 10 ++++++++++ buildah.go | 2 +- changelog.txt | 10 ++++++++++ contrib/rpm/buildah.spec | 12 ++++++++++-- 4 files changed, 31 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b456cffa8a5..941a35535f0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,16 @@ # Changelog +## v1.14.7 (2020-04-07) + Bump github.com/containers/image/v5 from 5.3.1 to 5.4.3 + make vendor: run `tidy` after `vendor` + Do not skip the directory when the ignore pattern matches + Bump github.com/containers/common from 0.7.0 to 0.8.1 + Downgrade siruspen/logrus from 1.4.2 + Fix errorf conventions + dockerignore tests : remove symlinks, rework + Bump back to v1.15.0-dev + ## v1.14.6 (2020-04-02) bud.bats - cleanup, refactoring vendor in latest containers/storage 1.18.0 and containers/common v0.7.0 diff --git a/buildah.go b/buildah.go index 2ece11acdb4..059f0edd816 100644 --- a/buildah.go +++ b/buildah.go @@ -27,7 +27,7 @@ const ( Package = "buildah" // Version for the Package. Bump version in contrib/rpm/buildah.spec // too. - Version = "1.15.0-dev" + Version = "1.14.7" // The value we use to identify what type of information, currently a // serialized Builder structure, we are using as per-container state. // This should only be changed when we make incompatible changes to diff --git a/changelog.txt b/changelog.txt index c740a4da307..ebbfa5a64b5 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,13 @@ +- Changelog for v1.14.7 (2020-04-07) + * Bump github.com/containers/image/v5 from 5.3.1 to 5.4.3 + * make vendor: run `tidy` after `vendor` + * Do not skip the directory when the ignore pattern matches + * Bump github.com/containers/common from 0.7.0 to 0.8.1 + * Downgrade siruspen/logrus from 1.4.2 + * Fix errorf conventions + * dockerignore tests : remove symlinks, rework + * Bump back to v1.15.0-dev + - Changelog for v1.14.6 (2020-04-02) * bud.bats - cleanup, refactoring * vendor in latest containers/storage 1.18.0 and containers/common v0.7.0 diff --git a/contrib/rpm/buildah.spec b/contrib/rpm/buildah.spec index 93a8d846ed0..10ec5321b7b 100644 --- a/contrib/rpm/buildah.spec +++ b/contrib/rpm/buildah.spec @@ -26,7 +26,7 @@ Name: buildah # Bump version in buildah.go too -Version: 1.15.0-dev +Version: 1.14.7 Release: 1.git%{shortcommit}%{?dist} Summary: A command line tool used to creating OCI Images License: ASL 2.0 @@ -99,7 +99,15 @@ make DESTDIR=%{buildroot} PREFIX=%{_prefix} install install.completions %{_datadir}/bash-completion/completions/* %changelog -* Thu Apr 2, 2020 Tom Sweeney 1.15.0-dev-1 +* Tue Apr 7, 2020 Tom Sweeney 1.14.7-1 +- Bump github.com/containers/image/v5 from 5.3.1 to 5.4.3 +- make vendor: run `tidy` after `vendor` +- Do not skip the directory when the ignore pattern matches +- Bump github.com/containers/common from 0.7.0 to 0.8.1 +- Downgrade siruspen/logrus from 1.4.2 +- Fix errorf conventions +- dockerignore tests : remove symlinks, rework +- Bump back to v1.15.0-dev * Thu Apr 2, 2020 Tom Sweeney 1.14.6-1 - bud.bats - cleanup, refactoring From d9489e43ccd30de8a7c3bffd24ade8e5093cbb1c Mon Sep 17 00:00:00 2001 From: TomSweeneyRedHat Date: Tue, 7 Apr 2020 16:08:17 -0400 Subject: [PATCH 2/2] Bump back to v1.15.0-dev Signed-off-by: TomSweeneyRedHat --- buildah.go | 2 +- contrib/rpm/buildah.spec | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/buildah.go b/buildah.go index 059f0edd816..2ece11acdb4 100644 --- a/buildah.go +++ b/buildah.go @@ -27,7 +27,7 @@ const ( Package = "buildah" // Version for the Package. Bump version in contrib/rpm/buildah.spec // too. - Version = "1.14.7" + Version = "1.15.0-dev" // The value we use to identify what type of information, currently a // serialized Builder structure, we are using as per-container state. // This should only be changed when we make incompatible changes to diff --git a/contrib/rpm/buildah.spec b/contrib/rpm/buildah.spec index 10ec5321b7b..ea6f7e15dcc 100644 --- a/contrib/rpm/buildah.spec +++ b/contrib/rpm/buildah.spec @@ -26,7 +26,7 @@ Name: buildah # Bump version in buildah.go too -Version: 1.14.7 +Version: 1.15.0-dev Release: 1.git%{shortcommit}%{?dist} Summary: A command line tool used to creating OCI Images License: ASL 2.0 @@ -99,6 +99,8 @@ make DESTDIR=%{buildroot} PREFIX=%{_prefix} install install.completions %{_datadir}/bash-completion/completions/* %changelog +* Tue Apr 7, 2020 Tom Sweeney 1.15.0-dev-1 + * Tue Apr 7, 2020 Tom Sweeney 1.14.7-1 - Bump github.com/containers/image/v5 from 5.3.1 to 5.4.3 - make vendor: run `tidy` after `vendor`