Skip to content

Commit c316532

Browse files
authored
fix: crosscompile windows build (#2391)
This is an attempt to fix the windows CI build issue. The regression is appears to have been introduced in d2d735c
1 parent a65d6ba commit c316532

File tree

2 files changed

+437
-251
lines changed

2 files changed

+437
-251
lines changed

go.mod

Lines changed: 71 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,11 @@ require (
3636
github.com/tidwall/gjson v1.14.3
3737
github.com/unrolled/secure v1.13.0
3838
golang.org/x/crypto v0.0.0-20221005025214-4161e89ecf1b
39-
golang.org/x/net v0.0.0-20221004154528-8021a29435af
40-
golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1
39+
golang.org/x/net v0.0.0-20220722155237-a158d28d115b
40+
golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5
41+
// Added to include security fix for
42+
// https://github.com/golang/go/issues/56152
43+
golang.org/x/text v0.3.8 // indirect
4144
gopkg.in/yaml.v2 v2.4.0
4245
k8s.io/api v0.25.2
4346
k8s.io/apimachinery v0.25.2
@@ -46,146 +49,142 @@ require (
4649
)
4750

4851
require (
49-
cloud.google.com/go/compute v1.10.0 // indirect
52+
cloud.google.com/go v0.99.0 // indirect
5053
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
51-
github.com/Azure/go-autorest/autorest v0.11.28 // indirect
52-
github.com/Azure/go-autorest/autorest/adal v0.9.21 // indirect
54+
github.com/Azure/go-autorest/autorest v0.11.27 // indirect
55+
github.com/Azure/go-autorest/autorest/adal v0.9.20 // indirect
5356
github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
5457
github.com/Azure/go-autorest/logger v0.2.1 // indirect
5558
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
5659
github.com/VividCortex/ewma v1.2.0 // indirect
5760
github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d // indirect
58-
github.com/aymanbagabas/go-osc52 v1.0.3 // indirect
5961
github.com/beorn7/perks v1.0.1 // indirect
6062
github.com/cespare/xxhash/v2 v2.1.2 // indirect
61-
github.com/charmbracelet/bubbles v0.14.0 // indirect
62-
github.com/charmbracelet/bubbletea v0.22.1 // indirect
63-
github.com/charmbracelet/lipgloss v0.6.0 // indirect
63+
github.com/charmbracelet/bubbles v0.10.3 // indirect
64+
github.com/charmbracelet/bubbletea v0.20.0 // indirect
65+
github.com/charmbracelet/lipgloss v0.5.0 // indirect
6466
github.com/cheggaaa/pb v1.0.29 // indirect
6567
github.com/containerd/console v1.0.3 // indirect
6668
github.com/coreos/go-semver v0.3.0 // indirect
67-
github.com/coreos/go-systemd/v22 v22.4.0 // indirect
69+
github.com/coreos/go-systemd/v22 v22.3.2 // indirect
6870
github.com/davecgh/go-spew v1.1.1 // indirect
69-
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0 // indirect
70-
github.com/docker/go-units v0.5.0 // indirect
71-
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
71+
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1 // indirect
72+
github.com/docker/go-units v0.4.0 // indirect
73+
github.com/emicklei/go-restful/v3 v3.8.0 // indirect
7274
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
7375
github.com/fatih/structs v1.1.0 // indirect
74-
github.com/fsnotify/fsnotify v1.5.4 // indirect
76+
github.com/fsnotify/fsnotify v1.5.1 // indirect
7577
github.com/gdamore/encoding v1.0.0 // indirect
76-
github.com/gdamore/tcell/v2 v2.5.3 // indirect
78+
github.com/gdamore/tcell/v2 v2.4.1-0.20210905002822-f057f0a857a1 // indirect
7779
github.com/go-logr/logr v1.2.3 // indirect
7880
github.com/go-ole/go-ole v1.2.6 // indirect
7981
github.com/go-openapi/analysis v0.21.4 // indirect
8082
github.com/go-openapi/jsonpointer v0.19.5 // indirect
8183
github.com/go-openapi/jsonreference v0.20.0 // indirect
82-
github.com/goccy/go-json v0.9.11 // indirect
84+
github.com/goccy/go-json v0.9.4 // indirect
8385
github.com/gogo/protobuf v1.3.2 // indirect
8486
github.com/golang-jwt/jwt v3.2.2+incompatible // indirect
8587
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
8688
github.com/golang/protobuf v1.5.2 // indirect
87-
github.com/google/gnostic v0.6.9 // indirect
88-
github.com/google/go-cmp v0.5.9 // indirect
89+
github.com/google/gnostic v0.5.7-v3refs // indirect
90+
github.com/google/go-cmp v0.5.8 // indirect
8991
github.com/google/gofuzz v1.2.0 // indirect
9092
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
9193
github.com/hashicorp/errwrap v1.1.0 // indirect
9294
github.com/hashicorp/go-multierror v1.1.1 // indirect
9395
github.com/hashicorp/hcl v1.0.0 // indirect
94-
github.com/imdario/mergo v0.3.13 // indirect
95-
github.com/inconshreveable/mousetrap v1.0.1 // indirect
96+
github.com/imdario/mergo v0.3.12 // indirect
97+
github.com/inconshreveable/mousetrap v1.0.0 // indirect
9698
github.com/josharian/intern v1.0.0 // indirect
9799
github.com/json-iterator/go v1.1.12 // indirect
98-
github.com/klauspost/cpuid/v2 v2.1.1 // indirect
100+
github.com/klauspost/cpuid/v2 v2.1.0 // indirect
101+
github.com/kr/pretty v0.2.1 // indirect
99102
github.com/lestrrat-go/backoff/v2 v2.0.8 // indirect
100-
github.com/lestrrat-go/blackmagic v1.0.1 // indirect
101-
github.com/lestrrat-go/httpcc v1.0.1 // indirect
102-
github.com/lestrrat-go/iter v1.0.2 // indirect
103-
github.com/lestrrat-go/jwx v1.2.25 // indirect
103+
github.com/lestrrat-go/blackmagic v1.0.0 // indirect
104+
github.com/lestrrat-go/httpcc v1.0.0 // indirect
105+
github.com/lestrrat-go/iter v1.0.1 // indirect
106+
github.com/lestrrat-go/jwx v1.2.19 // indirect
104107
github.com/lestrrat-go/option v1.0.0 // indirect
105108
github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
106-
github.com/lufia/plan9stats v0.0.0-20220913051719-115f729f3c8c // indirect
107-
github.com/magiconair/properties v1.8.6 // indirect
109+
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
110+
github.com/magiconair/properties v1.8.5 // indirect
108111
github.com/mailru/easyjson v0.7.7 // indirect
109-
github.com/mattn/go-colorable v0.1.13 // indirect
110-
github.com/mattn/go-ieproxy v0.0.9 // indirect
111-
github.com/mattn/go-isatty v0.0.16 // indirect
112-
github.com/mattn/go-localereader v0.0.1 // indirect
113-
github.com/mattn/go-runewidth v0.0.14 // indirect
114-
github.com/matttproud/golang_protobuf_extensions v1.0.2 // indirect
112+
github.com/mattn/go-colorable v0.1.12 // indirect
113+
github.com/mattn/go-ieproxy v0.0.1 // indirect
114+
github.com/mattn/go-isatty v0.0.14 // indirect
115+
github.com/mattn/go-runewidth v0.0.13 // indirect
116+
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
115117
github.com/mb0/glob v0.0.0-20160210091149-1eb79d2de6c4 // indirect
116-
github.com/miekg/dns v1.1.50 // indirect
118+
github.com/miekg/dns v1.1.48 // indirect
117119
github.com/minio/colorjson v1.0.2 // indirect
118120
github.com/minio/filepath v1.0.0 // indirect
119121
github.com/minio/md5-simd v1.1.2 // indirect
120122
github.com/minio/sha256-simd v1.0.0 // indirect
121-
github.com/mitchellh/mapstructure v1.5.0 // indirect
123+
github.com/mitchellh/mapstructure v1.4.3 // indirect
122124
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
123125
github.com/modern-go/reflect2 v1.0.2 // indirect
124126
github.com/montanaflynn/stats v0.6.6 // indirect
125127
github.com/muesli/ansi v0.0.0-20211031195517-c9f0611b6c70 // indirect
126-
github.com/muesli/cancelreader v0.2.2 // indirect
127128
github.com/muesli/reflow v0.3.0 // indirect
128-
github.com/muesli/termenv v0.13.0 // indirect
129+
github.com/muesli/termenv v0.11.1-0.20220212125758-44cd13922739 // indirect
129130
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
130-
github.com/navidys/tvxwidgets v0.1.1 // indirect
131+
github.com/navidys/tvxwidgets v0.1.0 // indirect
131132
github.com/oklog/ulid v1.3.1 // indirect
132133
github.com/olekukonko/tablewriter v0.0.5 // indirect
133-
github.com/pelletier/go-toml v1.9.5 // indirect
134-
github.com/pelletier/go-toml/v2 v2.0.5 // indirect
134+
github.com/pelletier/go-toml v1.9.4 // indirect
135135
github.com/philhofer/fwd v1.1.2-0.20210722190033-5c56ac6d0bb9 // indirect
136136
github.com/pkg/errors v0.9.1 // indirect
137-
github.com/pkg/xattr v0.4.9 // indirect
137+
github.com/pkg/xattr v0.4.5 // indirect
138138
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
139139
github.com/posener/complete v1.2.3 // indirect
140140
github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c // indirect
141-
github.com/prometheus/client_golang v1.13.0 // indirect
141+
github.com/prometheus/client_golang v1.12.2 // indirect
142142
github.com/prometheus/client_model v0.2.0 // indirect
143-
github.com/prometheus/common v0.37.0 // indirect
144-
github.com/prometheus/procfs v0.8.0 // indirect
145-
github.com/prometheus/prom2json v1.3.2 // indirect
146-
github.com/rivo/tview v0.0.0-20220916081518-2e69b7385a37 // indirect
147-
github.com/rivo/uniseg v0.4.2 // indirect
143+
github.com/prometheus/common v0.33.0 // indirect
144+
github.com/prometheus/procfs v0.7.3 // indirect
145+
github.com/prometheus/prom2json v1.3.1 // indirect
146+
github.com/rivo/tview v0.0.0-20220216162559-96063d6082f3 // indirect
147+
github.com/rivo/uniseg v0.2.0 // indirect
148148
github.com/rjeczalik/notify v0.9.2 // indirect
149-
github.com/shirou/gopsutil/v3 v3.22.9 // indirect
149+
github.com/shirou/gopsutil/v3 v3.22.7 // indirect
150150
github.com/sirupsen/logrus v1.9.0 // indirect
151-
github.com/spf13/afero v1.9.2 // indirect
152-
github.com/spf13/cast v1.5.0 // indirect
151+
github.com/spf13/afero v1.6.0 // indirect
152+
github.com/spf13/cast v1.4.1 // indirect
153153
github.com/spf13/jwalterweatherman v1.1.0 // indirect
154154
github.com/spf13/pflag v1.0.5 // indirect
155-
github.com/spf13/viper v1.13.0 // indirect
156-
github.com/subosito/gotenv v1.4.1 // indirect
155+
github.com/spf13/viper v1.10.0 // indirect
156+
github.com/subosito/gotenv v1.2.0 // indirect
157157
github.com/tidwall/match v1.1.1 // indirect
158-
github.com/tidwall/pretty v1.2.1 // indirect
158+
github.com/tidwall/pretty v1.2.0 // indirect
159159
github.com/tinylib/msgp v1.1.7-0.20211026165309-e818a1881b0e // indirect
160160
github.com/tklauser/go-sysconf v0.3.10 // indirect
161-
github.com/tklauser/numcpus v0.5.0 // indirect
161+
github.com/tklauser/numcpus v0.4.0 // indirect
162162
github.com/yusufpapurcu/wmi v1.2.2 // indirect
163-
go.etcd.io/etcd/api/v3 v3.5.5 // indirect
164-
go.etcd.io/etcd/client/pkg/v3 v3.5.5 // indirect
165-
go.etcd.io/etcd/client/v3 v3.5.5 // indirect
166-
go.mongodb.org/mongo-driver v1.10.3 // indirect
167-
go.uber.org/atomic v1.10.0 // indirect
163+
go.etcd.io/etcd/api/v3 v3.5.2 // indirect
164+
go.etcd.io/etcd/client/pkg/v3 v3.5.2 // indirect
165+
go.etcd.io/etcd/client/v3 v3.5.2 // indirect
166+
go.mongodb.org/mongo-driver v1.10.0 // indirect
167+
go.uber.org/atomic v1.9.0 // indirect
168168
go.uber.org/multierr v1.8.0 // indirect
169-
go.uber.org/zap v1.23.0 // indirect
169+
go.uber.org/zap v1.21.0 // indirect
170170
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
171-
golang.org/x/sync v0.0.0-20220929204114-8fcdb60fdcc0 // indirect
172-
golang.org/x/sys v0.0.0-20221006211917-84dc82d7e875 // indirect
173-
golang.org/x/term v0.0.0-20220919170432-7a66f970e087 // indirect
174-
golang.org/x/text v0.3.8 // indirect
175-
golang.org/x/time v0.0.0-20220922220347-f3bd1da661af // indirect
171+
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 // indirect
172+
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f // indirect
173+
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
174+
golang.org/x/time v0.0.0-20220224211638-0e9765cccd65 // indirect
176175
golang.org/x/tools v0.1.12 // indirect
177176
google.golang.org/appengine v1.6.7 // indirect
178-
google.golang.org/genproto v0.0.0-20220930163606-c98284e70a91 // indirect
179-
google.golang.org/grpc v1.50.0 // indirect
180-
google.golang.org/protobuf v1.28.1 // indirect
177+
google.golang.org/genproto v0.0.0-20220302033224-9aa15565e42a // indirect
178+
google.golang.org/grpc v1.44.0 // indirect
179+
google.golang.org/protobuf v1.28.0 // indirect
181180
gopkg.in/h2non/filetype.v1 v1.0.5 // indirect
182181
gopkg.in/inf.v0 v0.9.1 // indirect
183-
gopkg.in/ini.v1 v1.67.0 // indirect
182+
gopkg.in/ini.v1 v1.66.6 // indirect
184183
gopkg.in/yaml.v3 v3.0.1 // indirect
185-
k8s.io/apiextensions-apiserver v0.25.2 // indirect
184+
k8s.io/apiextensions-apiserver v0.24.3 // indirect
186185
k8s.io/klog/v2 v2.80.1 // indirect
187-
k8s.io/kube-openapi v0.0.0-20220928191237-829ce0c27909 // indirect
188-
sigs.k8s.io/controller-runtime v0.13.0 // indirect
186+
k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 // indirect
187+
sigs.k8s.io/controller-runtime v0.11.1 // indirect
189188
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
190189
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
191190
sigs.k8s.io/yaml v1.3.0 // indirect

0 commit comments

Comments
 (0)