From 8346d332a216f377731e2dcaa2c7902c391dd91b Mon Sep 17 00:00:00 2001 From: John Kerl Date: Sun, 9 Jan 2022 19:51:18 -0500 Subject: [PATCH] Tag 6.0.0 (#850) --- create-release-tarball | 4 ++-- docs/src/build.md | 4 ++-- docs/src/build.md.in | 4 ++-- docs/src/installing-miller.md | 2 +- docs/src/manpage.md | 2 +- docs/src/manpage.txt | 2 +- internal/pkg/version/version.go | 2 +- man/manpage.txt | 2 +- man/mlr.1 | 2 +- miller.spec | 4 ++-- 10 files changed, 14 insertions(+), 14 deletions(-) diff --git a/create-release-tarball b/create-release-tarball index e223724d40..d4141430d1 100755 --- a/create-release-tarball +++ b/create-release-tarball @@ -69,7 +69,7 @@ fi TGZ_NAME=miller-${VERSION}.tar.gz # Create the release tarball. -echo "Wrtiting $TGZ_NAME ..." +echo "Writing $TGZ_NAME ..." $tar \ --transform 's,^./,miller-'$VERSION'/,' \ --exclude data \ @@ -94,4 +94,4 @@ $tar \ ./man \ ./test -echo "Wrote $TGZ_NAME" +echo "Wrote $TGZ_NAME" diff --git a/docs/src/build.md b/docs/src/build.md index 4fbc38d672..7422fee052 100644 --- a/docs/src/build.md +++ b/docs/src/build.md @@ -76,9 +76,9 @@ In this example I am using version 6.1.0 to 6.2.0; of course that will change fo * Create the release tarball: * `make release_tarball` - * This creates `miller-6.2.0-dev.tar.gz` which we'll upload to GitHub, the URL of which will be in our `miller.spec` + * This creates `miller-6.2.0.tar.gz` which we'll upload to GitHub, the URL of which will be in our `miller.spec` * Get `mlr.{arch}` binaries from latest successful build from [https://github.com/johnkerl/miller/actions](https://github.com/johnkerl/miller/actions), or, build them on buildboxes. - * Prepare the source RPM following `README-RPM.md`. + * Prepare the source RPM following [README-RPM.md](https://github.com/johnkerl/miller/blob/main/README-RPM.md). * Create the Github release tag: diff --git a/docs/src/build.md.in b/docs/src/build.md.in index d43bbba410..fea41436ac 100644 --- a/docs/src/build.md.in +++ b/docs/src/build.md.in @@ -60,9 +60,9 @@ In this example I am using version 6.1.0 to 6.2.0; of course that will change fo * Create the release tarball: * `make release_tarball` - * This creates `miller-6.2.0-dev.tar.gz` which we'll upload to GitHub, the URL of which will be in our `miller.spec` + * This creates `miller-6.2.0.tar.gz` which we'll upload to GitHub, the URL of which will be in our `miller.spec` * Get `mlr.{arch}` binaries from latest successful build from [https://github.com/johnkerl/miller/actions](https://github.com/johnkerl/miller/actions), or, build them on buildboxes. - * Prepare the source RPM following `README-RPM.md`. + * Prepare the source RPM following [README-RPM.md](https://github.com/johnkerl/miller/blob/main/README-RPM.md). * Create the Github release tag: diff --git a/docs/src/installing-miller.md b/docs/src/installing-miller.md index 84819378b8..b9f9e1cb79 100644 --- a/docs/src/installing-miller.md +++ b/docs/src/installing-miller.md @@ -32,7 +32,7 @@ As a first check, you should be able to run `mlr --version` at your system's com mlr --version 
-mlr 6.0.0-rc1
+mlr 6.0.0
As a second check, given [example.csv](./example.csv) you should be able to do diff --git a/docs/src/manpage.md b/docs/src/manpage.md index 75fdf683c9..5ed7e8f3fe 100644 --- a/docs/src/manpage.md +++ b/docs/src/manpage.md @@ -50,7 +50,7 @@ DESCRIPTION insertion-ordered hash map. This encompasses a variety of data formats, including but not limited to the familiar CSV, TSV, and JSON. (Miller can handle positionally-indexed data as a special case.) This - manpage documents mlr 6.0.0-rc1. + manpage documents mlr 6.0.0. EXAMPLES mlr --icsv --opprint cat example.csv diff --git a/docs/src/manpage.txt b/docs/src/manpage.txt index 26c23ee817..59671e40ea 100644 --- a/docs/src/manpage.txt +++ b/docs/src/manpage.txt @@ -29,7 +29,7 @@ DESCRIPTION insertion-ordered hash map. This encompasses a variety of data formats, including but not limited to the familiar CSV, TSV, and JSON. (Miller can handle positionally-indexed data as a special case.) This - manpage documents mlr 6.0.0-rc1. + manpage documents mlr 6.0.0. EXAMPLES mlr --icsv --opprint cat example.csv diff --git a/internal/pkg/version/version.go b/internal/pkg/version/version.go index 4199125c7a..7dd25998e8 100644 --- a/internal/pkg/version/version.go +++ b/internal/pkg/version/version.go @@ -1,4 +1,4 @@ package version // STRING is the current Miller major/minor/patch version as a single string. -var STRING string = "6.0.0-rc1" +var STRING string = "6.0.0" diff --git a/man/manpage.txt b/man/manpage.txt index 26c23ee817..59671e40ea 100644 --- a/man/manpage.txt +++ b/man/manpage.txt @@ -29,7 +29,7 @@ DESCRIPTION insertion-ordered hash map. This encompasses a variety of data formats, including but not limited to the familiar CSV, TSV, and JSON. (Miller can handle positionally-indexed data as a special case.) This - manpage documents mlr 6.0.0-rc1. + manpage documents mlr 6.0.0. EXAMPLES mlr --icsv --opprint cat example.csv diff --git a/man/mlr.1 b/man/mlr.1 index 1accdb2555..cf4002b0c0 100644 --- a/man/mlr.1 +++ b/man/mlr.1 @@ -47,7 +47,7 @@ on integer-indexed fields: if the natural data structure for the latter is the array, then Miller's natural data structure is the insertion-ordered hash map. This encompasses a variety of data formats, including but not limited to the familiar CSV, TSV, and JSON. (Miller can handle positionally-indexed data as -a special case.) This manpage documents mlr 6.0.0-rc1. +a special case.) This manpage documents mlr 6.0.0. .SH "EXAMPLES" .sp diff --git a/miller.spec b/miller.spec index 8087a1e3e5..8247f746f0 100644 --- a/miller.spec +++ b/miller.spec @@ -3,7 +3,7 @@ Name: miller Version: 6.0.0 Release: 1%{?dist} License: BSD -Source: https://github.com/johnkerl/miller/releases/download/%{version}/mlr-%{version}.tar.gz +Source: https://github.com/johnkerl/miller/releases/download/%{version}/miller-%{version}.tar.gz URL: https://miller.readthedocs.io # gcc for cgo transitive dependency BuildRequires: golang @@ -36,7 +36,7 @@ make install %{_mandir}/man1/mlr.1* %changelog -* Has not happened yet John Kerl - 6.0.0-1 +* Sun Jan 9 2022 John Kerl - 6.0.0-1 - 6.0.0 release * Tue Mar 23 2021 John Kerl - 5.10.2-1