Merge pull request #2458 from monopole/updateBuildScripts

Update build scripts
2026-06-17 11:58:18 +00:00 · 2020-05-11 09:42:46 -07:00 · 2020-05-11 09:40:54 -07:00 · 2020-05-11 08:48:11 -07:00 · 2020-05-11 08:33:23 -07:00
5 changed files with 12 additions and 5 deletions
--- a/kustomize/go.mod
+++ b/kustomize/go.mod
@@ -12,7 +12,7 @@ require (
 	k8s.io/apimachinery v0.17.0
 	k8s.io/client-go v0.17.0
 	sigs.k8s.io/controller-runtime v0.4.0
-	sigs.k8s.io/kustomize/api v0.0.0
+	sigs.k8s.io/kustomize/api v0.3.3
 	sigs.k8s.io/kustomize/cmd/config v0.1.10
 	sigs.k8s.io/kustomize/cmd/kubectl v0.0.3
 	sigs.k8s.io/kustomize/kstatus v0.0.1
@@ -26,7 +26,6 @@ exclude (
 )

 replace (
-	sigs.k8s.io/kustomize/api v0.0.0 => ../api
 	sigs.k8s.io/kustomize/cmd/kubectl v0.0.3 => ../cmd/kubectl
 	sigs.k8s.io/kustomize/kstatus v0.0.1 => ../kstatus
 )
--- a/kustomize/go.sum
+++ b/kustomize/go.sum
@@ -758,6 +758,8 @@ sigs.k8s.io/controller-runtime v0.4.0 h1:wATM6/m+3w8lj8FXNaO6Fs/rq/vqoOjO1Q116Z9
 sigs.k8s.io/controller-runtime v0.4.0/go.mod h1:ApC79lpY3PHW9xj/w9pj+lYkLgwAAUZwfXkME1Lajns=
 sigs.k8s.io/kustomize v2.0.3+incompatible h1:JUufWFNlI44MdtnjUqVnvh29rR37PQFzPbLXqhyOyX0=
 sigs.k8s.io/kustomize v2.0.3+incompatible/go.mod h1:MkjgH3RdOWrievjo6c9T245dYlB5QeXV4WCbnt/PEpU=
+sigs.k8s.io/kustomize/api v0.3.3 h1:E3nUKiTnezsA1NoGA37jWlatjjMq2a/i1UIGAzSZGnk=
+sigs.k8s.io/kustomize/api v0.3.3/go.mod h1:JU8ooABgAO6xVDiWThwKtKShI8phhAALPaMfBpmNDOM=
 sigs.k8s.io/kustomize/cmd/config v0.1.10 h1:qEwEEPbtE/o43q99vTzEZalrySzT0AF5LiphTEFInoc=
 sigs.k8s.io/kustomize/cmd/config v0.1.10/go.mod h1:oa+ycMeFZDZUEfMLFGEIGpnr8IWPDKqJZvaisqdzeGk=
 sigs.k8s.io/kustomize/kyaml v0.1.10 h1:ZZfBnA/kYa9ZxUFIgI9oq3pWKzzA1gGOKgU0Hv/NhVg=
--- a/releasing/cloudbuild.sh
+++ b/releasing/cloudbuild.sh
@@ -42,6 +42,13 @@ setSemVer

 cd $module

+# 2020/May/11 Windows build temporaraily removed
+# ("- windows" removed from the goos: list below)
+# because of https://github.com/microsoft/go-winio/issues/161
+# Seeing the following in builds:
+#   : /go/pkg/mod/golang.org/x/crypto@v0.0.0-20190923035154-9ee001bba392/ssh/terminal/util_windows.go:97:61:
+#  multiple-value "golang.org/x/sys/windows".GetCurrentProcess() in single-value context
+
 configFile=$(mktemp)
 cat <<EOF >$configFile
 project_name: $module
@@ -73,7 +80,6 @@ builds:
  goos:
  - linux
  - darwin
-  - windows
  goarch:
  - amd64
 archives:
--- a/releasing/cloudbuild_api.yaml
+++ b/releasing/cloudbuild_api.yaml
@@ -1,7 +1,7 @@
 steps:
 - name: "gcr.io/cloud-builders/git"
  args: [fetch, --tags, --depth=100]
- name: "goreleaser/goreleaser:v0.120.3"
+- name: "goreleaser/goreleaser:v0.134.0"
  entrypoint: /bin/sh
  args: ["releasing/cloudbuild.sh", "api"]
  secretEnv: ['GITHUB_TOKEN']
--- a/releasing/cloudbuild_kustomize.yaml
+++ b/releasing/cloudbuild_kustomize.yaml
@@ -1,7 +1,7 @@
 steps:
 - name: "gcr.io/cloud-builders/git"
  args: [fetch, --tags, --depth=100]
- name: "goreleaser/goreleaser:v0.120.3"
+- name: "goreleaser/goreleaser:v0.134.0"
  entrypoint: /bin/sh
  args: ["releasing/cloudbuild.sh", "kustomize"]
  secretEnv: ['GITHUB_TOKEN']
Author	SHA1	Message	Date
Jeff Regan	897e7b6e61	Merge pull request #2458 from monopole/updateBuildScripts Update build scripts	2020-05-11 09:42:46 -07:00
Jeffrey Regan	70b1cfef4a	Update build scripts	2020-05-11 09:40:54 -07:00
Jeff Regan	4c9cc343cd	Merge pull request #2457 from monopole/pinToApiV033 Pin kustomize CLI to kustomize API v0.3.3	2020-05-11 08:48:11 -07:00
jregan	5213426f0a	Pin kustomize to api v0.3.3	2020-05-11 08:33:23 -07:00