From 6984a116962fd8ea33d337d6bae7e84b2e1a8cc8 Mon Sep 17 00:00:00 2001 From: Sean Darcy Date: Fri, 7 Jan 2022 16:20:55 +1100 Subject: [PATCH] minor bug fix --- .github/workflows/releases.yml | 2 +- go.mod | 3 ++- go.sum | 4 ++++ utils/ci.go | 1 + 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/releases.yml b/.github/workflows/releases.yml index 9a658f5..5c08771 100644 --- a/.github/workflows/releases.yml +++ b/.github/workflows/releases.yml @@ -39,7 +39,7 @@ jobs: strategy: fail-fast: true matrix: - go-version: [1.15.x] + go-version: [1.14.x] os: [ubuntu-latest] runs-on: ${{ matrix.os }} environment: "PPA Signing Environment" diff --git a/go.mod b/go.mod index 9765f03..7c0caaa 100644 --- a/go.mod +++ b/go.mod @@ -28,5 +28,6 @@ require ( google.golang.org/genproto v0.0.0-20210611144927-798beca9d670 // indirect google.golang.org/grpc v1.38.0 google.golang.org/protobuf v1.26.0 - src.techknowlogick.com/xgo v1.4.1-0.20210609162758-fbe5924e4399 // indirect + gopkg.in/yaml.v2 v2.4.0 // indirect + src.techknowlogick.com/xgo v1.4.1-0.20220106204436-795b29d5ed5b // indirect ) diff --git a/go.sum b/go.sum index baca296..c38fbf7 100644 --- a/go.sum +++ b/go.sum @@ -441,6 +441,8 @@ gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.3 h1:fvjTMHxHEw/mxHbtzPi3JCcKXQRAnQTBRo6YCJSVHKI= gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= +gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= @@ -453,3 +455,5 @@ rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= src.techknowlogick.com/xgo v1.4.1-0.20210609162758-fbe5924e4399 h1:H5M9ldXUnfo8LWzpRGhAhzbIcc5dyHP+wsZGxk5eHKI= src.techknowlogick.com/xgo v1.4.1-0.20210609162758-fbe5924e4399/go.mod h1:31CE1YKtDOrKTk9PSnjTpe6YbO6W/0LTYZ1VskL09oU= +src.techknowlogick.com/xgo v1.4.1-0.20220106204436-795b29d5ed5b h1:PlPO2I3UUqnLPpuhHIFOht3/han0MZq7HZ2fUpt031s= +src.techknowlogick.com/xgo v1.4.1-0.20220106204436-795b29d5ed5b/go.mod h1:31CE1YKtDOrKTk9PSnjTpe6YbO6W/0LTYZ1VskL09oU= diff --git a/utils/ci.go b/utils/ci.go index 92b2fca..e377c65 100644 --- a/utils/ci.go +++ b/utils/ci.go @@ -984,6 +984,7 @@ func doXgo(cmdline []string) { xgoArgs := append(buildFlags(env), flag.Args()...) xgoArgs = append(xgoArgs, []string{"--targets", *xtarget}...) xgoArgs = append(xgoArgs, []string{"--dest", outDir}...) + xgoArgs = append(xgoArgs, []string{"--go", "go-1.15.x"}...) xgoArgs = append(xgoArgs, "-v") xgoArgs = append(xgoArgs, "./"+cmd) // relative package name (assumes we are inside GOPATH) xgo := xgoTool(xgoArgs)