move iso CHANGELOG logic around
parent
379ecd2803
commit
9f1bf48849
2
Makefile
2
Makefile
|
|
@ -287,7 +287,7 @@ minikube-iso-arm64: minikube-iso-aarch64
|
||||||
|
|
||||||
minikube-iso-%: deploy/iso/minikube-iso/board/minikube/%/rootfs-overlay/usr/bin/auto-pause # build minikube iso
|
minikube-iso-%: deploy/iso/minikube-iso/board/minikube/%/rootfs-overlay/usr/bin/auto-pause # build minikube iso
|
||||||
echo $(ISO_VERSION) > deploy/iso/minikube-iso/board/minikube/$*/rootfs-overlay/etc/VERSION
|
echo $(ISO_VERSION) > deploy/iso/minikube-iso/board/minikube/$*/rootfs-overlay/etc/VERSION
|
||||||
echo $(shell git log --no-merges --pretty='format:%H %s' | head -1) >> deploy/iso/minikube-iso/board/minikube/$*/rootfs-overlay/etc/CHANGELOG
|
cp deploy/iso/minikube-iso/CHANGELOG deploy/iso/minikube-iso/board/minikube/$*/rootfs-overlay/etc/CHANGELOG
|
||||||
cp deploy/iso/minikube-iso/arch/$*/Config.in.tmpl deploy/iso/minikube-iso/Config.in
|
cp deploy/iso/minikube-iso/arch/$*/Config.in.tmpl deploy/iso/minikube-iso/Config.in
|
||||||
if [ ! -d $(BUILD_DIR)/buildroot ]; then \
|
if [ ! -d $(BUILD_DIR)/buildroot ]; then \
|
||||||
mkdir -p $(BUILD_DIR); \
|
mkdir -p $(BUILD_DIR); \
|
||||||
|
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
9d1bcee02221e62882cf3cf1280371cb8f50f3ba swap order of iso builds?
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
9d1bcee02221e62882cf3cf1280371cb8f50f3ba swap order of iso builds?
|
|
||||||
|
|
@ -37,6 +37,7 @@ if [[ -z $ISO_VERSION ]]; then
|
||||||
now=$(date +%s)
|
now=$(date +%s)
|
||||||
export ISO_VERSION=$IV-$now-$ghprbPullId
|
export ISO_VERSION=$IV-$now-$ghprbPullId
|
||||||
export ISO_BUCKET=minikube-builds/iso/$ghprbPullId
|
export ISO_BUCKET=minikube-builds/iso/$ghprbPullId
|
||||||
|
echo "#$ghprPullId - $ghprPullTitle" >> deploy/iso/minikube-iso/CHANGELOG
|
||||||
else
|
else
|
||||||
release=true
|
release=true
|
||||||
export ISO_VERSION
|
export ISO_VERSION
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue