v4.1.0

.github/workflows/release.yml

@@ -1,4 +1,4 @@
-name: Publish image to Dockerhub
+name: Release YQ
 on:
   push:
     tags:
@@ -6,14 +6,17 @@ on:
 
 jobs:
   publishGitRelease:
-    environment: gitrelease
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-
+      - uses: actions/setup-go@v2
-      # steps for building assets
+        with:
+          go-version: '^1.15'
       - name: Cross compile
-        run: ./scripts/xcompile.sh
+        run: |
+          sudo apt-get install rhash -y
+          go get github.com/mitchellh/gox
+          ./scripts/xcompile.sh
 
       - name: Create Release
         id: create_release

cmd/version.go

@@ -11,7 +11,7 @@ var (
 	GitDescribe string
 
 	// Version is main version number that is being run at the moment.
-	Version = "4.0.0"
+	Version = "4.1.0"
 
 	// 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

release_instructions.txt

@@ -1,16 +1,9 @@
 - increment version in version.go
 - increment version in snapcraft.yaml
-- commit
-- tag git with same version number
 - make sure local build passes
-- push tag to git
+- tag git with same version number
-  - 3.4.0, v3
+- commit vX tag - this will trigger github actions
-  - git push --tags
+- use github actions to publish docker and make github release
-- make local xcompile (builds binaries for all platforms)
-
-- git release
-  ./scripts/release.sh
-  ./scripts/upload.sh
 
 - snapcraft
   - will auto create a candidate, test it works then promote

scripts/xcompile.sh

@@ -1,22 +1,22 @@
 #!/bin/bash
-
+set -e
 # This assumes that gonative and gox is installed as per the 'one time setup' instructions
 # at https://github.com/inconshreveable/gonative
 
 
-CGO_ENABLED=0 gox -ldflags "${LDFLAGS}" -output="build/yq_{{.OS}}_{{.Arch}}"
+CGO_ENABLED=0 gox -ldflags "${LDFLAGS}" -output="build/yq_{{.OS}}_{{.Arch}}" --osarch="darwin/amd64 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"
-# include non-default linux builds too
-CGO_ENABLED=0 gox -ldflags "${LDFLAGS}" -os=linux  -output="build/yq_{{.OS}}_{{.Arch}}"
 
 cd build
-rhash -r -a . -P -o checksums
+rhash -r -a . -o checksums
 
 rhash --list-hashes > checksums_hashes_order
 
-find . | xargs -I {} tar czvf {}.tar.gz {}
+find . -executable -type f | xargs -I {} tar czvf {}.tar.gz {}
+
+# just in case find thinks this is executable...
+rm -f checksums_hashes_order.tar.gz 
+rm -f checksums.tar.gz
 
-rm checksums_hashes_order.tar.gz
-rm checksums.tar.gz
 rm yq_windows_386.exe.tar.gz
 rm yq_windows_amd64.exe.tar.gz
 

snap/snapcraft.yaml

@@ -1,5 +1,5 @@
 name: yq
-version: '4.0.0'
+version: '4.1.0'
 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.