diff --git a/.github/workflows/goreleaser.yml b/.github/workflows/goreleaser.yml index 1d64b54..25d5c5a 100644 --- a/.github/workflows/goreleaser.yml +++ b/.github/workflows/goreleaser.yml @@ -51,14 +51,14 @@ jobs: go-version: '1.11' - name: Compile for Windows x64 - run: go build -o dist/gogo_windowsxp_amd64.exe -ldflags "-s -w -X 'github.com/chainreactors/gogo/v2/internal/core.ver=${{ github.ref }}'" -tags="forceposix json" -asmflags "all=-trimpath=${{ env.GOPATH }}" -gcflags "all=-trimpath=${{ env.GOPATH }}" . + run: go build -o dist/gogo_windowsxp_amd64.exe -ldflags "-s -w -X 'github.com/chainreactors/gogo/v2/internal/core.ver=${{ github.ref }}'" -tags="forceposix" -asmflags "all=-trimpath=${{ env.GOPATH }}" -gcflags "all=-trimpath=${{ env.GOPATH }}" . env: GOOS: windows GOARCH: amd64 working-directory: v2 - name: Compile for Windows x86 - run: go build -o dist/gogo_windowsxp_386.exe -ldflags "-s -w -X 'github.com/chainreactors/gogo/v2/internal/core.ver=${{ github.ref }}'" -tags="forceposix json" -asmflags "all=-trimpath=${{ env.GOPATH }}" -gcflags "all=-trimpath=${{ env.GOPATH }}" . + run: go build -o dist/gogo_windowsxp_386.exe -ldflags "-s -w -X 'github.com/chainreactors/gogo/v2/internal/core.ver=${{ github.ref }}'" -tags="forceposix" -asmflags "all=-trimpath=${{ env.GOPATH }}" -gcflags "all=-trimpath=${{ env.GOPATH }}" . env: GOOS: windows GOARCH: '386' diff --git a/v2/.goreleaser.yml b/v2/.goreleaser.yml index 6374011..14f0c75 100644 --- a/v2/.goreleaser.yml +++ b/v2/.goreleaser.yml @@ -39,7 +39,6 @@ builds: - -trimpath tags: - forceposix - - json - noembed asmflags: - all=-trimpath={{.Env.GOPATH}} diff --git a/v2/go.mod b/v2/go.mod index 55f4883..4e3dc37 100644 --- a/v2/go.mod +++ b/v2/go.mod @@ -7,7 +7,7 @@ require ( github.com/chainreactors/files v0.0.0-20240716182835-7884ee1e77f0 github.com/chainreactors/fingers v1.0.1-0.20240730173434-48ba7446b94b github.com/chainreactors/logs v0.0.0-20240207121836-c946f072f81f - github.com/chainreactors/neutron v0.0.0-20240829091112-f7d7ee172362 + github.com/chainreactors/neutron v0.0.0-20240924094734-5be76870bfa2 github.com/chainreactors/parsers v0.0.0-20240829055950-923f89a92b84 github.com/chainreactors/utils v0.0.0-20240805193040-ff3b97aa3c3f github.com/jessevdk/go-flags v1.5.0 diff --git a/v2/go.sum b/v2/go.sum index 944ca3c..dcee568 100644 --- a/v2/go.sum +++ b/v2/go.sum @@ -88,6 +88,8 @@ github.com/chainreactors/logs v0.0.0-20240207121836-c946f072f81f h1:tcfp+CEdgiMv github.com/chainreactors/logs v0.0.0-20240207121836-c946f072f81f/go.mod h1:6Mv6W70JrtL6VClulZhmMRZnoYpcTahcDTKLMNEjK0o= github.com/chainreactors/neutron v0.0.0-20240829091112-f7d7ee172362 h1:tNLtCf7wFcvm2ILmIJjTTi63/R8If2NZseccRaP1jZQ= github.com/chainreactors/neutron v0.0.0-20240829091112-f7d7ee172362/go.mod h1:A6oRL1+WyEBCWwUeVcx0W5xONNS6lc6HJ0Y2R/tuXSc= +github.com/chainreactors/neutron v0.0.0-20240924094734-5be76870bfa2 h1:Izc44a2QzKFpa2jFOfLiyT/d1uUW2Dj1eBC+JGDOCzU= +github.com/chainreactors/neutron v0.0.0-20240924094734-5be76870bfa2/go.mod h1:A6oRL1+WyEBCWwUeVcx0W5xONNS6lc6HJ0Y2R/tuXSc= github.com/chainreactors/parsers v0.0.0-20240829055950-923f89a92b84 h1:F6umsdHLxKILxrH5wY2zVYwxMmb8XdCEc9apf7GWpOk= github.com/chainreactors/parsers v0.0.0-20240829055950-923f89a92b84/go.mod h1:7rXdYz6jrdjF0WUH1ICcAXKIKKjKmJo2PU8u43V7jkA= github.com/chainreactors/utils v0.0.0-20240528085651-ba1b255482c1/go.mod h1:JA4eiQZm+7AsfjXBcIzIdVKBEhDCb16eNtWFCGTxlvs= diff --git a/v2/templates b/v2/templates index c81fd39..31279d5 160000 --- a/v2/templates +++ b/v2/templates @@ -1 +1 @@ -Subproject commit c81fd395299626b649fc6fd42ed7e46917d4f955 +Subproject commit 31279d5d0939f0028c21debc878905ebc6cf31f0