From 6ba8dc75a6fef7628d7932b672fc4c4cdc79c415 Mon Sep 17 00:00:00 2001
From: Mike Farah <mikefarah@gmail.com>
Date: Sun, 5 Sep 2021 11:11:51 +1000
Subject: [PATCH] Bumping version

---
 cmd/version.go           | 2 +-
 github-action/Dockerfile | 2 +-
 release_instructions.txt | 1 +
 release_notes.txt        | 7 +++++++
 snap/snapcraft.yaml      | 2 +-
 5 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/cmd/version.go b/cmd/version.go
index 08fcb1f8..73c63fa4 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.12.1"
+	Version = "4.12.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/github-action/Dockerfile b/github-action/Dockerfile
index 3af950cc..c8d38531 100644
--- a/github-action/Dockerfile
+++ b/github-action/Dockerfile
@@ -1,4 +1,4 @@
-FROM mikefarah/yq:4.12.1
+FROM mikefarah/yq:4.12.2
 
 COPY entrypoint.sh /entrypoint.sh
 
diff --git a/release_instructions.txt b/release_instructions.txt
index 8805d2db..1123d44f 100644
--- a/release_instructions.txt
+++ b/release_instructions.txt
@@ -1,3 +1,4 @@
+- update release notes
 - increment version in version.go
 - increment version in snapcraft.yaml
 - increment version in github-action/Dockerfile
diff --git a/release_notes.txt b/release_notes.txt
index efb8f767..f8f06c67 100644
--- a/release_notes.txt
+++ b/release_notes.txt
@@ -1,3 +1,10 @@
+4.12.2:
+- Fix processing of hex numbers #929
+- Fixed alternative and union operator issues #930
+
+4.12.1:
+ - Merge comment fix #919
+
 4.12.0:
 - Can now convert yaml to properties properties format (`-o=props`), See [docs](https://mikefarah.gitbook.io/yq/v/v4.x/usage/properties) for more info.
 - Fixed document header/footer comment handling when merging (https://github.com/mikefarah/yq/issues/919)
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 8b37b0f0..2b886c66 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -1,5 +1,5 @@
 name: yq
-version: '4.12.1'
+version: '4.12.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.