Merge pull request #429 from mengqiy/fix_cloud_build

fix cloud build
kubernetes-sigs · Oct 10, 2018 · 6ab4798 · 6ab4798
2 parents 6b9865f + f084285
commit 6ab4798
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 34 deletions.
diff --git a/build/.goreleaser.yml b/build/.goreleaser.yml
@@ -22,7 +22,6 @@ builds:
    - CGO_ENABLED=0
 archive:
   files:
-    - "/workspace/_output/kubebuilder/bin/vendor.tar.gz"
     - "/workspace/_output/{{ .Os }}_{{ .Arch }}/kubebuilder/bin/*"
   wrap_in_directory: true
 # wrap all the binaries under 'bin/' dir

diff --git a/build/build_vendor.sh b/build/build_vendor.sh
diff --git a/build/cloudbuild.yaml b/build/cloudbuild.yaml
@@ -33,8 +33,6 @@ steps:
 - name: "gcr.io/kubebuilder/thirdparty-darwin:1.11.0"
   args: ["tar", "-xzvf", "/kubebuilder_darwin_amd64.tar.gz"]
   dir: "_output/darwin_amd64"
-- name: "ubuntu"
-  args: ["bash", "build/build_vendor.sh"]
 - name: "gcr.io/kubebuilder/goreleaser_with_go_1.10:0.0.1"
   args: ["bash", "build/build_kubebuilder.sh"]
   env:

diff --git a/build/cloudbuild_local.yaml b/build/cloudbuild_local.yaml
@@ -31,8 +31,6 @@ steps:
 - name: "gcr.io/kubebuilder/thirdparty-darwin:1.11.0"
   args: ["tar", "-xzvf", "/kubebuilder_darwin_amd64.tar.gz"]
   dir: "_output/darwin_amd64"
-- name: "ubuntu"
-  args: ["bash", "build/build_vendor.sh"]
 - name: "gcr.io/kubebuilder/goreleaser_with_go_1.10:0.0.1"
   args: ["bash", "build/build_kubebuilder.sh", "--snapshot"]
   env:

diff --git a/build/cloudbuild_snapshot.yaml b/build/cloudbuild_snapshot.yaml
@@ -31,8 +31,6 @@ steps:
 - name: "gcr.io/kubebuilder/thirdparty-darwin:1.11.0"
   args: ["tar", "-xzvf", "/kubebuilder_darwin_amd64.tar.gz"]
   dir: "_output/darwin_amd64"
-- name: "ubuntu"
-  args: ["bash", "build/build_vendor.sh"]
 - name: "gcr.io/kubebuilder/goreleaser_with_go_1.10:0.0.1"
   args: ["bash", "build/build_kubebuilder.sh", "--snapshot"]
   env:

diff --git a/common.sh b/common.sh
@@ -97,7 +97,6 @@ function prepare_staging_dir {
   else
     rm -f "$kb_root_dir/kubebuilder/bin/kubebuilder"
     rm -f "$kb_root_dir/kubebuilder/bin/kubebuilder-gen"
-    rm -f "$kb_root_dir/kubebuilder/bin/vendor.tar.gz"
   fi
 }