From bc2118736bca883de2e2c345bb7f7ef52c994920 Mon Sep 17 00:00:00 2001 From: Mike Farah Date: Mon, 28 Mar 2022 14:36:27 +1100 Subject: [PATCH] v4.24.2 --- .github/workflows/release.yml | 2 +- README.md | 4 ++-- cmd/version.go | 2 +- release_instructions.txt | 3 --- release_notes.txt | 3 +++ scripts/xcompile.sh | 2 +- snap/snapcraft.yaml | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8736c2ec..ac53f03d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -39,7 +39,7 @@ jobs: - name: Cross compile run: | sudo apt-get install rhash -y - go get github.com/mitchellh/gox + go install github.com/mitchellh/gox@v1.0.1 mkdir -p build cp yq.1 build/yq.1 ./scripts/xcompile.sh diff --git a/README.md b/README.md index cdfc4f0d..f0dc2708 100644 --- a/README.md +++ b/README.md @@ -217,9 +217,9 @@ USER yq See https://mikefarah.gitbook.io/yq/usage/github-action for more. -### Go Get: +### Go Install: ``` -GO111MODULE=on go get github.com/mikefarah/yq/v4 +go install github.com/mikefarah/yq/v4@latest ``` ## Community Supported Installation methods diff --git a/cmd/version.go b/cmd/version.go index 0aa250c5..fb78987c 100644 --- a/cmd/version.go +++ b/cmd/version.go @@ -11,7 +11,7 @@ var ( GitDescribe string // Version is main version number that is being run at the moment. - Version = "4.24.1" + Version = "4.24.2" // VersionPrerelease is a pre-release marker for the version. If this is "" (empty string) // then it means that it is a final release. Otherwise, this is a pre-release diff --git a/release_instructions.txt b/release_instructions.txt index 91c4497a..81f1b16f 100644 --- a/release_instructions.txt +++ b/release_instructions.txt @@ -23,9 +23,6 @@ then use the UI (https://snapcraft.io/yq/release) -- go get - - update the readme instructions - - brew - brew bump-formula-pr --url=https://github.com/mikefarah/yq/archive/2.2.0.tar.gz yq - if that fails with random ruby errors try: diff --git a/release_notes.txt b/release_notes.txt index c2b4ec53..29633652 100644 --- a/release_notes.txt +++ b/release_notes.txt @@ -1,3 +1,6 @@ +4.24.2: + - Fixing release pipeline for go1.18 + 4.24.1: - Added comparison operators! (#94) - Bumped golang to 1.18 (#1153) diff --git a/scripts/xcompile.sh b/scripts/xcompile.sh index c7b24534..bf19cda1 100755 --- a/scripts/xcompile.sh +++ b/scripts/xcompile.sh @@ -1,6 +1,6 @@ #!/bin/bash set -e -# you may need to go get github.com/mitchellh/gox first +# you may need to go install github.com/mitchellh/gox@v1.0.1 first CGO_ENABLED=0 gox -ldflags "${LDFLAGS}" -output="build/yq_{{.OS}}_{{.Arch}}" --osarch="darwin/amd64 darwin/arm64 freebsd/386 freebsd/amd64 freebsd/arm linux/386 linux/amd64 linux/arm linux/arm64 linux/mips linux/mips64 linux/mips64le linux/mipsle linux/ppc64 linux/ppc64le linux/s390x netbsd/386 netbsd/amd64 netbsd/arm openbsd/386 openbsd/amd64 windows/386 windows/amd64" diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 17e2f8c0..36fd4af0 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -1,5 +1,5 @@ name: yq -version: '4.24.1' +version: '4.24.2' summary: A lightweight and portable command-line YAML processor description: | The aim of the project is to be the jq or sed of yaml files.