Skip to content

Commit ed19c2f

Browse files
authored
Merge pull request #794 from BenTheElder/fix-release
fix release process
2 parents 543c84e + a29c62e commit ed19c2f

File tree

5 files changed

+9
-7
lines changed

5 files changed

+9
-7
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ require (
99
golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8
1010
k8s.io/api v0.0.0-20190409021203-6e4e0e4f393b // indirect
1111
k8s.io/apimachinery v0.0.0-20190404173353-6a84e37a896d
12-
sigs.k8s.io/kustomize/v3 v3.1.0
12+
sigs.k8s.io/kustomize/v3 v3.1.1-0.20190821175718-4b67a6de1296
1313
)

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,8 +163,8 @@ k8s.io/klog v0.3.3 h1:niceAagH1tzskmaie/icWd7ci1wbG7Bf2c6YGcQv+3c=
163163
k8s.io/klog v0.3.3/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
164164
k8s.io/kube-openapi v0.0.0-20190603182131-db7b694dc208 h1:5sW+fEHvlJI3Ngolx30CmubFulwH28DhKjGf70Xmtco=
165165
k8s.io/kube-openapi v0.0.0-20190603182131-db7b694dc208/go.mod h1:nfDlWeOsu3pUf4yWGL+ERqohP4YsZcBJXWMK+gkzOA4=
166-
sigs.k8s.io/kustomize/v3 v3.1.0 h1:FnNC1UtUjZlepvWUGwaAcFHw2rjNIaZvBUPCvaXz0Fo=
167-
sigs.k8s.io/kustomize/v3 v3.1.0/go.mod h1:ztX4zYc/QIww3gSripwF7TBOarBTm5BvyAMem0kCzOE=
166+
sigs.k8s.io/kustomize/v3 v3.1.1-0.20190821175718-4b67a6de1296 h1:iQaIG5Dq+3qSiaFrJ/l/0MjjxKmdwyVNpKRYJwUe/+0=
167+
sigs.k8s.io/kustomize/v3 v3.1.1-0.20190821175718-4b67a6de1296/go.mod h1:ztX4zYc/QIww3gSripwF7TBOarBTm5BvyAMem0kCzOE=
168168
sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI=
169169
sigs.k8s.io/yaml v1.1.0 h1:4A07+ZFc2wgJwo8YNlQpr1rVlgUDlxXHhPJciaPY5gs=
170170
sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=

hack/ci/build-all.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ export GO111MODULE="on"
2929
GOPROXY="${GOPROXY:-https://proxy.golang.org}"
3030
export GOPROXY
3131

32-
# build and kind
33-
go install -v .
32+
# build and test kind
33+
hack/release/build/cross.sh
3434
go test -v ./...
3535

3636
# build and test kindnetd

hack/release/build/cross.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,13 @@ build() {
4949
make build
5050
}
5151

52-
# TODO(bentheelder): support more platforms
5352
echo "Building in parallel for:"
5453
build "linux" "amd64" & \
5554
build "linux" "arm" & \
5655
build "linux" "arm64" & \
5756
build "linux" "ppc64le" & \
5857
build "darwin" "amd64" & \
5958
build "windows" "amd64" & \
60-
wait
59+
# we want each pid to be an argument
60+
# shellcheck disable=SC2046
61+
wait $(jobs -p)

hack/release/create.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ set_version "${1}"
6565
make_commit "${1}"
6666
add_tag "${1}"
6767
echo "Building ..."
68+
make clean
6869
./hack/release/build/cross.sh --clean
6970

7071
# update to the second version

0 commit comments

Comments
 (0)