Skip to content

Fix reuse of nightly tarballs #1223

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
TimoWilken wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Fix reuse of nightly tarballs #1223

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 6 additions & 8 deletions daily-tags.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,13 +134,6 @@ if echo "$AUTOTAG_TAG" | grep -Fq '!!'; then
exit 1
fi

# The tag doesn't exist yet, so build using the branch first.
for package in $PACKAGES; do
edit_package_tag "$package" "$DEFAULTS" "rc/$AUTOTAG_TAG" "$AUTOTAG_OVERRIDE_VERSION"
done

git -C alidist diff || :

for package in $PACKAGES; do (
rm -rf "${package,,}.git"
AUTOTAG_REMOTE=$(grep -E '^(source:|write_repo:)' "alidist/${package,,}.sh" | sort -r | head -n1 | cut -d: -f2- | xargs echo)
Expand All @@ -151,7 +144,7 @@ for package in $PACKAGES; do (

[[ -d $AUTOTAG_MIRROR ]] || AUTOTAG_MIRROR=
mkdir "${package,,}.git"
cd "${package,,}.git"
pushd "${package,,}.git"
git clone --bare ${AUTOTAG_MIRROR:+--reference=$AUTOTAG_MIRROR} "$AUTOTAG_REMOTE" .
AUTOTAG_HASH=$(git ls-remote origin "refs/tags/$AUTOTAG_TAG" | tail -1 | cut -f1)
if [ -n "$AUTOTAG_HASH" ]; then
Expand Down Expand Up @@ -186,9 +179,14 @@ for package in $PACKAGES; do (
# At this point, we have $AUTOTAG_HASH for sure. It might come from HEAD, an existing rc/* branch,
# or an existing tag. We always create a new branch out of it
git push origin "+$AUTOTAG_HASH:refs/heads/rc/$AUTOTAG_TAG"

popd
edit_package_tag "$package" "$DEFAULTS" "$AUTOTAG_HASH" "$AUTOTAG_OVERRIDE_VERSION"
fi
); done

git -C alidist diff || :

# Set default remote store -- S3 on slc8 and Ubuntu, rsync everywhere else.
case "$ARCHITECTURE" in
slc8_*|ubuntu*) : "${REMOTE_STORE:=b3://alibuild-repo::rw}" ;;
Expand Down