Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions scripts/build/git-clone.bash
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ perform() {
git -C "$1" submodule update --init --recursive
git -C "$1" submodule foreach git reset --hard
git -C "$1" submodule foreach git clean -ffdx

# set the same timestamps for all files, required by some Makefiles
( cd "$1"; git ls-files -z | xargs -0 touch -h )
}

while read REPO COMMIT_SHA REST; do
Expand Down
20 changes: 8 additions & 12 deletions scripts/update-version.bash
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

set -eo pipefail

if [[ $# -ne 2 ]]; then
echo "usage: $0 [version-file|version] [sha]"
if [[ $# -ne 1 ]] && [[ $# -ne 2 ]]; then
echo "usage: $0 [version-file|version] [sticky-rev]"
exit 1
fi

Expand All @@ -23,25 +23,21 @@ fi

SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
SCRIPT_ROOT=$(realpath "$0")
ROOT_SHA="${2:-master}"
ROOT_REV="$2"
ROOT_TS=""

tmp_dir=$(mktemp -d -t ci-XXXXXXXXXX)
trap 'cd ; rm -rf $tmp_dir' EXIT

perform() {
git clone "git://git.proxmox.com/git/$1.git" 2>/dev/null
if [[ -z "$ROOT_TS" ]]; then
if [[ "$ROOT_SHA" == "last" ]]; then
ROOT_SHA="$2"
fi
REPO_REV=$(git -C "$1" rev-parse "$ROOT_SHA")
ROOT_TS=$(git -C "$1" log -1 --format=%ct "$ROOT_SHA")

if [[ -z "$ROOT_REV" ]] || [[ -z "$ROOT_TS" ]]; then
REPO_REV=$(git -C "$1" rev-parse "${ROOT_REV:-HEAD}")
ROOT_TS=$(git -C "$1" log -1 --format=%ct "$REPO_REV")
else
while read REPO_TS REPO_REV; do
if [[ $REPO_TS -le $ROOT_TS ]]; then
break
fi
[[ $REPO_TS -le $ROOT_TS ]] && break
done < <(git -C "$1" log --format="%ct %H")
fi

Expand Down