k3s: convenience change to update script
This commit is contained in:
parent
7cb6b3251f
commit
49b299074d
|
@ -7,8 +7,8 @@ WORKDIR=$(mktemp -d)
|
||||||
trap "rm -rf ${WORKDIR}" EXIT
|
trap "rm -rf ${WORKDIR}" EXIT
|
||||||
|
|
||||||
NIXPKGS_ROOT="$(git rev-parse --show-toplevel)"/
|
NIXPKGS_ROOT="$(git rev-parse --show-toplevel)"/
|
||||||
NIXPKGS_K3S_FOLDER=$(cd $(dirname ${BASH_SOURCE[0]}); pwd -P)/
|
NIXPKGS_K3S_PATH=$(cd $(dirname ${BASH_SOURCE[0]}); pwd -P)/
|
||||||
cd ${NIXPKGS_K3S_FOLDER}
|
cd ${NIXPKGS_K3S_PATH}
|
||||||
|
|
||||||
LATEST_TAG_RAWFILE=${WORKDIR}/latest_tag.json
|
LATEST_TAG_RAWFILE=${WORKDIR}/latest_tag.json
|
||||||
curl --silent ${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} \
|
curl --silent ${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} \
|
||||||
|
@ -60,7 +60,7 @@ CRI_CTL_VERSION=$(grep github.com/kubernetes-sigs/cri-tools ${FILE_GO_MOD} \
|
||||||
| head -n1 | awk '{print $4}' | sed -e 's/"//g' -e 's/^v//')
|
| head -n1 | awk '{print $4}' | sed -e 's/"//g' -e 's/^v//')
|
||||||
|
|
||||||
setKV () {
|
setKV () {
|
||||||
sed -i "s|$1 = \".*\"|$1 = \"${2:-}\"|" ${NIXPKGS_K3S_FOLDER}default.nix
|
sed -i "s|$1 = \".*\"|$1 = \"${2:-}\"|" ${NIXPKGS_K3S_PATH}default.nix
|
||||||
}
|
}
|
||||||
|
|
||||||
setKV k3sVersion ${K3S_VERSION}
|
setKV k3sVersion ${K3S_VERSION}
|
||||||
|
@ -91,3 +91,11 @@ else
|
||||||
echo "Update failed. K3S_VENDOR_SHA256 is empty."
|
echo "Update failed. K3S_VENDOR_SHA256 is empty."
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# `git` flag here is to be used by local maintainers to speed up the bump process
|
||||||
|
if [ $# -eq 1 ] && [ "$1" = "git" ]; then
|
||||||
|
OLD_VERSION="$(nix-instantiate --eval -E "with import $NIXPKGS_ROOT. {}; k3s.version or (builtins.parseDrvName k3s.name).version" | tr -d '"')"
|
||||||
|
git switch -c "package-k3s-${K3S_VERSION}"
|
||||||
|
git add "$NIXPKGS_K3S_PATH"/default.nix
|
||||||
|
git commit -m "k3s: ${OLD_VERSION} -> ${K3S_VERSION}"
|
||||||
|
fi
|
||||||
|
|
Loading…
Reference in a new issue