From 074d78539653d8e1d433639835f516bef1da6b96 Mon Sep 17 00:00:00 2001 From: Alberto Cavalcante <54247214+albertocavalcante@users.noreply.github.com> Date: Tue, 22 Apr 2025 19:32:47 -0700 Subject: [PATCH 1/5] chore(devtools): use curl instead of wget for better compatibility with MacOS --- scripts/devtools.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/devtools.sh b/scripts/devtools.sh index 6fe80caf..782a1fe1 100755 --- a/scripts/devtools.sh +++ b/scripts/devtools.sh @@ -2,4 +2,4 @@ set -ex 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.62.0 -wget -O- -nv https://raw.githubusercontent.com/securego/gosec/master/install.sh | sh -s +curl -sSfL https://raw.githubusercontent.com/securego/gosec/master/install.sh | sh -s From 649c9a083a0596087ccb9b5e155b94dccea03223 Mon Sep 17 00:00:00 2001 From: Alberto Cavalcante <54247214+albertocavalcante@users.noreply.github.com> Date: Tue, 22 Apr 2025 19:59:18 -0700 Subject: [PATCH 2/5] chore(check): use golangci-lint from GOPATH/bin as first option --- scripts/check.sh | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/scripts/check.sh b/scripts/check.sh index 069947ff..4f9b04fa 100755 --- a/scripts/check.sh +++ b/scripts/check.sh @@ -3,10 +3,23 @@ set -o errexit set -o pipefail -if command -v golangci-lint &> /dev/null -then - golangci-lint run --verbose +# TODO: Check if the found golangci-lint version matches the expected version (e.g., v1.62.0), especially if falling back to PATH version. + +GOPATH_LINT="$(go env GOPATH)/bin/golangci-lint" +BIN_LINT="./bin/golangci-lint" +LINT_CMD="" + +if [ -f "$GOPATH_LINT" ]; then + LINT_CMD="$GOPATH_LINT" +elif [ -f "$BIN_LINT" ]; then + LINT_CMD="$BIN_LINT" +elif command -v golangci-lint &> /dev/null; then + # Using PATH version, ensure compatibility (see TODO) + LINT_CMD="golangci-lint" else - ./bin/golangci-lint run --verbose + echo "Error: golangci-lint not found in $GOPATH/bin, ./bin, or PATH." + echo "Please run scripts/devtools.sh or ensure golangci-lint is installed correctly." + exit 1 fi +"$LINT_CMD" run --verbose From 2cb7498444d046a2ec983c51d625525733222280 Mon Sep 17 00:00:00 2001 From: Alberto Cavalcante <54247214+albertocavalcante@users.noreply.github.com> Date: Tue, 22 Apr 2025 20:01:52 -0700 Subject: [PATCH 3/5] chore(release): add windows arm64 binary target for release --- .goreleaser.yaml | 1 + scripts/xcompile.sh | 2 ++ 2 files changed, 3 insertions(+) diff --git a/.goreleaser.yaml b/.goreleaser.yaml index 5ce01617..f38d0578 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -38,6 +38,7 @@ builds: - openbsd_amd64 - windows_386 - windows_amd64 + - windows_arm64 no_unique_dist_dir: true diff --git a/scripts/xcompile.sh b/scripts/xcompile.sh index 8009e135..283e6406 100755 --- a/scripts/xcompile.sh +++ b/scripts/xcompile.sh @@ -24,9 +24,11 @@ tar czvf yq_man_page_only.tar.gz yq.1 -C ../scripts install-man-page.sh rm yq_windows_386.exe.tar.gz rm yq_windows_amd64.exe.tar.gz +rm yq_windows_arm64.exe.tar.gz zip yq_windows_386.zip yq_windows_386.exe zip yq_windows_amd64.zip yq_windows_amd64.exe +zip yq_windows_arm64.zip yq_windows_arm64.exe rm yq.1 From 7dc5efee624030af4a1c13902d181e527816410a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 10 Apr 2025 03:19:46 +0000 Subject: [PATCH 4/5] Bump golang.org/x/net from 0.34.0 to 0.39.0 Bumps [golang.org/x/net](https://github.com/golang/net) from 0.34.0 to 0.39.0. - [Commits](https://github.com/golang/net/compare/v0.34.0...v0.39.0) --- updated-dependencies: - dependency-name: golang.org/x/net dependency-version: 0.39.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 6 +++--- go.sum | 16 ++++++++-------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/go.mod b/go.mod index 0eeaf421..766cd32f 100644 --- a/go.mod +++ b/go.mod @@ -16,8 +16,8 @@ require ( github.com/spf13/cobra v1.8.1 github.com/spf13/pflag v1.0.6 github.com/yuin/gopher-lua v1.1.1 - golang.org/x/net v0.34.0 - golang.org/x/text v0.23.0 + golang.org/x/net v0.39.0 + golang.org/x/text v0.24.0 gopkg.in/op/go-logging.v1 v1.0.0-20160211212156-b2cb9fa56473 gopkg.in/yaml.v3 v3.0.1 ) @@ -26,7 +26,7 @@ require ( github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-isatty v0.0.20 // indirect - golang.org/x/sys v0.29.0 // indirect + golang.org/x/sys v0.32.0 // indirect ) go 1.23.0 diff --git a/go.sum b/go.sum index cf198270..5ac248e6 100644 --- a/go.sum +++ b/go.sum @@ -63,16 +63,16 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/gopher-lua v1.1.1 h1:kYKnWBjvbNP4XLT3+bPEwAXJx262OhaHDWDVOPjL46M= github.com/yuin/gopher-lua v1.1.1/go.mod h1:GBR0iDaNXjAgGg9zfCvksxSRnQx76gclCIb7kdAd1Pw= -golang.org/x/crypto v0.32.0 h1:euUpcYgM8WcP71gNpTqQCn6rC2t6ULUPiOzfWaXVVfc= -golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc= -golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0= -golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k= +golang.org/x/crypto v0.37.0 h1:kJNSjF/Xp7kU0iB2Z+9viTPMW4EqqsrywMXLJOOsXSE= +golang.org/x/crypto v0.37.0/go.mod h1:vg+k43peMZ0pUMhYmVAWysMK35e6ioLh3wB8ZCAfbVc= +golang.org/x/net v0.39.0 h1:ZCu7HMWDxpXpaiKdhzIfaltL9Lp31x/3fCP11bc6/fY= +golang.org/x/net v0.39.0/go.mod h1:X7NRbYVEA+ewNkCNyJ513WmMdQ3BineSwVtN2zD/d+E= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU= -golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY= -golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4= +golang.org/x/sys v0.32.0 h1:s77OFDvIQeibCmezSnk/q6iAfkdiQaJi4VzroCFrN20= +golang.org/x/sys v0.32.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= +golang.org/x/text v0.24.0 h1:dd5Bzh4yt5KYA8f9CJHCP4FB4D51c2c6JvN37xJJkJ0= +golang.org/x/text v0.24.0/go.mod h1:L8rBsPeo2pSS+xqN0d5u2ikmjtmoJbDBT1b7nHvFCdU= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/op/go-logging.v1 v1.0.0-20160211212156-b2cb9fa56473 h1:6D+BvnJ/j6e222UW8s2qTSe3wGBtvo0MbVQG/c5k8RE= From b26de947585c63910e212dbd890744d7b839965a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 10 Apr 2025 03:19:32 +0000 Subject: [PATCH 5/5] Bump github.com/magiconair/properties from 1.8.9 to 1.8.10 Bumps [github.com/magiconair/properties](https://github.com/magiconair/properties) from 1.8.9 to 1.8.10. - [Release notes](https://github.com/magiconair/properties/releases) - [Commits](https://github.com/magiconair/properties/compare/v1.8.9...v1.8.10) --- updated-dependencies: - dependency-name: github.com/magiconair/properties dependency-version: 1.8.10 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 766cd32f..3ef01a56 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,7 @@ require ( github.com/goccy/go-json v0.10.5 github.com/goccy/go-yaml v1.13.3 github.com/jinzhu/copier v0.4.0 - github.com/magiconair/properties v1.8.9 + github.com/magiconair/properties v1.8.10 github.com/pelletier/go-toml/v2 v2.2.3 github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e github.com/spf13/cobra v1.8.1 diff --git a/go.sum b/go.sum index 5ac248e6..bc2d92e4 100644 --- a/go.sum +++ b/go.sum @@ -38,8 +38,8 @@ github.com/jinzhu/copier v0.4.0 h1:w3ciUoD19shMCRargcpm0cm91ytaBhDvuRpz1ODO/U8= github.com/jinzhu/copier v0.4.0/go.mod h1:DfbEm0FYsaqBcKcFuvmOZb218JkPGtvSHsKg8S8hyyg= github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ= github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI= -github.com/magiconair/properties v1.8.9 h1:nWcCbLq1N2v/cpNsy5WvQ37Fb+YElfq20WJ/a8RkpQM= -github.com/magiconair/properties v1.8.9/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0= +github.com/magiconair/properties v1.8.10 h1:s31yESBquKXCV9a/ScB3ESkOjUYYv+X0rg8SYxI99mE= +github.com/magiconair/properties v1.8.10/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0= github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=