Skip to content

Commit 6ab4798

Browse files
authored
Merge pull request #429 from mengqiy/fix_cloud_build
fix cloud build
2 parents 6b9865f + f084285 commit 6ab4798

File tree

6 files changed

+0
-34
lines changed

6 files changed

+0
-34
lines changed

build/.goreleaser.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ builds:
2222
- CGO_ENABLED=0
2323
archive:
2424
files:
25-
- "/workspace/_output/kubebuilder/bin/vendor.tar.gz"
2625
- "/workspace/_output/{{ .Os }}_{{ .Arch }}/kubebuilder/bin/*"
2726
wrap_in_directory: true
2827
# wrap all the binaries under 'bin/' dir

build/build_vendor.sh

Lines changed: 0 additions & 26 deletions
This file was deleted.

build/cloudbuild.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@ steps:
3333
- name: "gcr.io/kubebuilder/thirdparty-darwin:1.11.0"
3434
args: ["tar", "-xzvf", "/kubebuilder_darwin_amd64.tar.gz"]
3535
dir: "_output/darwin_amd64"
36-
- name: "ubuntu"
37-
args: ["bash", "build/build_vendor.sh"]
3836
- name: "gcr.io/kubebuilder/goreleaser_with_go_1.10:0.0.1"
3937
args: ["bash", "build/build_kubebuilder.sh"]
4038
env:

build/cloudbuild_local.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@ steps:
3131
- name: "gcr.io/kubebuilder/thirdparty-darwin:1.11.0"
3232
args: ["tar", "-xzvf", "/kubebuilder_darwin_amd64.tar.gz"]
3333
dir: "_output/darwin_amd64"
34-
- name: "ubuntu"
35-
args: ["bash", "build/build_vendor.sh"]
3634
- name: "gcr.io/kubebuilder/goreleaser_with_go_1.10:0.0.1"
3735
args: ["bash", "build/build_kubebuilder.sh", "--snapshot"]
3836
env:

build/cloudbuild_snapshot.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@ steps:
3131
- name: "gcr.io/kubebuilder/thirdparty-darwin:1.11.0"
3232
args: ["tar", "-xzvf", "/kubebuilder_darwin_amd64.tar.gz"]
3333
dir: "_output/darwin_amd64"
34-
- name: "ubuntu"
35-
args: ["bash", "build/build_vendor.sh"]
3634
- name: "gcr.io/kubebuilder/goreleaser_with_go_1.10:0.0.1"
3735
args: ["bash", "build/build_kubebuilder.sh", "--snapshot"]
3836
env:

common.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,6 @@ function prepare_staging_dir {
9797
else
9898
rm -f "$kb_root_dir/kubebuilder/bin/kubebuilder"
9999
rm -f "$kb_root_dir/kubebuilder/bin/kubebuilder-gen"
100-
rm -f "$kb_root_dir/kubebuilder/bin/vendor.tar.gz"
101100
fi
102101
}
103102

0 commit comments

Comments
 (0)