mirror of
https://github.com/mikefarah/yq.git
synced 2024-11-12 05:38:04 +00:00
Bumped go compiler; bumped quality tools
This commit is contained in:
parent
187d9523c6
commit
b1a40a9fb7
4
.github/workflows/go.yml
vendored
4
.github/workflows/go.yml
vendored
@ -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
2
.github/workflows/release.yml
vendored
@ -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: |
|
||||||
|
4
.gitignore
vendored
4
.gitignore
vendored
@ -59,4 +59,6 @@ debian/files
|
|||||||
/.idea
|
/.idea
|
||||||
|
|
||||||
# vscode
|
# vscode
|
||||||
.vscode
|
.vscode
|
||||||
|
|
||||||
|
yq3
|
||||||
|
2
go.mod
2
go.mod
@ -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
|
||||||
|
@ -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,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 (
|
||||||
@ -80,7 +79,7 @@ var notEqualsOpType = &operationType{Type: "NOT_EQUALS", NumArgs: 2, Precedence:
|
|||||||
|
|
||||||
var compareOpType = &operationType{Type: "COMPARE", NumArgs: 2, Precedence: 40, Handler: compareOperator}
|
var compareOpType = &operationType{Type: "COMPARE", NumArgs: 2, Precedence: 40, Handler: compareOperator}
|
||||||
|
|
||||||
//createmap needs to be above union, as we use union to build the components of the objects
|
// createmap needs to be above union, as we use union to build the components of the objects
|
||||||
var createMapOpType = &operationType{Type: "CREATE_MAP", NumArgs: 2, Precedence: 15, Handler: createMapOperator}
|
var createMapOpType = &operationType{Type: "CREATE_MAP", NumArgs: 2, Precedence: 15, Handler: createMapOperator}
|
||||||
|
|
||||||
var shortPipeOpType = &operationType{Type: "SHORT_PIPE", NumArgs: 2, Precedence: 45, Handler: pipeOperator}
|
var shortPipeOpType = &operationType{Type: "SHORT_PIPE", NumArgs: 2, Precedence: 45, Handler: pipeOperator}
|
||||||
@ -431,7 +430,7 @@ func (p *Operation) toString() string {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
//use for debugging only
|
// use for debugging only
|
||||||
func NodesToString(collection *list.List) string {
|
func NodesToString(collection *list.List) string {
|
||||||
if !log.IsEnabledFor(logging.DEBUG) {
|
if !log.IsEnabledFor(logging.DEBUG) {
|
||||||
return ""
|
return ""
|
||||||
|
@ -72,7 +72,7 @@ func sequenceFor(d *dataTreeNavigator, context Context, matchingNode *CandidateN
|
|||||||
return &CandidateNode{Node: innerList, Document: document, Path: path}, nil
|
return &CandidateNode{Node: innerList, Document: document, Path: path}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
//NOTE: here the document index gets dropped so we
|
// NOTE: here the document index gets dropped so we
|
||||||
// no longer know where the node originates from.
|
// no longer know where the node originates from.
|
||||||
func listToNodeSeq(list *list.List) *yaml.Node {
|
func listToNodeSeq(list *list.List) *yaml.Node {
|
||||||
node := yaml.Node{Kind: yaml.SequenceNode, Tag: "!!seq"}
|
node := yaml.Node{Kind: yaml.SequenceNode, Tag: "!!seq"}
|
||||||
|
@ -81,8 +81,8 @@ var encoderDecoderOperatorScenarios = []expressionScenario{
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
description: "Decode tsv encoded string",
|
description: "Decode tsv encoded string",
|
||||||
document: `a: "cats dogs\ngreat cool as well"`,
|
document: `a: "cats dogs\ngreat cool as well"`,
|
||||||
expression: `.a |= @tsvd`,
|
expression: `.a |= @tsvd`,
|
||||||
expected: []string{
|
expected: []string{
|
||||||
"D0, P[], (doc)::a:\n - cats: great\n dogs: cool as well\n",
|
"D0, P[], (doc)::a:\n - cats: great\n dogs: cool as well\n",
|
||||||
},
|
},
|
||||||
|
@ -17,7 +17,7 @@ func sortOperator(d *dataTreeNavigator, context Context, expressionNode *Express
|
|||||||
}
|
}
|
||||||
|
|
||||||
// context represents the current matching nodes in the expression pipeline
|
// context represents the current matching nodes in the expression pipeline
|
||||||
//expressionNode is your current expression (sort_by)
|
// expressionNode is your current expression (sort_by)
|
||||||
func sortByOperator(d *dataTreeNavigator, context Context, expressionNode *ExpressionNode) (Context, error) {
|
func sortByOperator(d *dataTreeNavigator, context Context, expressionNode *ExpressionNode) (Context, error) {
|
||||||
|
|
||||||
results := list.New()
|
results := list.New()
|
||||||
|
@ -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
|
||||||
|
@ -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
|
||||||
|
Loading…
Reference in New Issue
Block a user