suyiiyii/yq
1
0
Fork 0
mirror of https://github.com/mikefarah/yq.git synced 2024-12-19 20:19:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bumped go compiler; bumped quality tools

Browse Source
This commit is contained in:
Mike Farah 2022-08-29 14:13:15 +10:00
parent 187d9523c6
commit b1a40a9fb7
11 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/go.yml vendored
View File

@ -10,10 +10,10 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Set up Go 1.18 - name: Set up Go 1.19
uses: actions/setup-go@v3 uses: actions/setup-go@v3
with: with:
go-version: 1.18 go-version: 1.19
id: go id: go
- name: Check out code into the Go module directory - name: Check out code into the Go module directory

2
.github/workflows/release.yml vendored
View File

@ -12,7 +12,7 @@ jobs:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- uses: actions/setup-go@v3 - uses: actions/setup-go@v3
with: with:
go-version: '^1.18' go-version: '^1.19'
- name: Compile man page markup - name: Compile man page markup
id: gen-man-page-md id: gen-man-page-md
run: | run: |

2
.gitignore vendored
View File

@ -60,3 +60,5 @@ debian/files
# vscode # vscode
.vscode .vscode
yq3

2
go.mod
View File

@ -27,4 +27,4 @@ require (
golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f // indirect golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f // indirect
) )
go 1.18 go 1.19

6
pkg/yqlib/csv_test.go
View File

@ -150,7 +150,7 @@ func testCSVScenario(t *testing.T, s formatScenario) {
} }
} }
func documentCSVDecodeObjectScenario(t *testing.T, w *bufio.Writer, s formatScenario, formatType string) { func documentCSVDecodeObjectScenario(w *bufio.Writer, s formatScenario, formatType string) {
writeOrPanic(w, fmt.Sprintf("## %v\n", s.description)) writeOrPanic(w, fmt.Sprintf("## %v\n", s.description))
if s.subdescription != "" { if s.subdescription != "" {
@ -250,9 +250,9 @@ func documentCSVScenario(t *testing.T, w *bufio.Writer, i interface{}) {
case "encode-tsv": case "encode-tsv":
documentCSVEncodeScenario(w, s, "tsv") documentCSVEncodeScenario(w, s, "tsv")
case "decode-csv-object": case "decode-csv-object":
documentCSVDecodeObjectScenario(t, w, s, "csv") documentCSVDecodeObjectScenario(w, s, "csv")
case "decode-tsv-object": case "decode-tsv-object":
documentCSVDecodeObjectScenario(t, w, s, "tsv") documentCSVDecodeObjectScenario(w, s, "tsv")
case "roundtrip-csv": case "roundtrip-csv":
documentCSVRoundTripScenario(w, s, "csv") documentCSVRoundTripScenario(w, s, "csv")

1
pkg/yqlib/lib.go
View File

@ -1,5 +1,4 @@
// Use the top level Evaluator or StreamEvaluator to evaluate expressions and return matches. // Use the top level Evaluator or StreamEvaluator to evaluate expressions and return matches.
//
package yqlib package yqlib
import ( import (

4
scripts/devtools.sh
View File

@ -1,5 +1,5 @@
#!/bin/sh #!/bin/sh
set -ex set -ex
go mod download golang.org/x/tools@latest go mod download golang.org/x/tools@latest
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.45.2 curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.49.0
wget -O- -nv https://raw.githubusercontent.com/securego/gosec/master/install.sh | sh -s v2.11.0 wget -O- -nv https://raw.githubusercontent.com/securego/gosec/master/install.sh | sh -s v2.13.1

2
snap/snapcraft.yaml
View File

@ -16,7 +16,7 @@ apps:
parts: parts:
yq: yq:
plugin: go plugin: go
go-channel: 1.18/stable go-channel: 1.19/stable
source: . source: .
source-type: git source-type: git
go-importpath: github.com/mikefarah/yq go-importpath: github.com/mikefarah/yq