mirror of
https://git.proxmox.com/git/llvm-toolchain
synced 2025-08-07 06:14:05 +00:00
master => main
This commit is contained in:
parent
7d0768312c
commit
21d1f39b89
12
debian/orig-tar.sh
vendored
12
debian/orig-tar.sh
vendored
@ -41,9 +41,9 @@ reset_repo ()
|
|||||||
git clean -qfd
|
git clean -qfd
|
||||||
git checkout .
|
git checkout .
|
||||||
git remote update > /dev/null
|
git remote update > /dev/null
|
||||||
git reset --hard origin/master > /dev/null
|
git reset --hard origin/main > /dev/null
|
||||||
git clean -qfd
|
git clean -qfd
|
||||||
git checkout master > /dev/null
|
git checkout main > /dev/null
|
||||||
git pull
|
git pull
|
||||||
cd -
|
cd -
|
||||||
}
|
}
|
||||||
@ -82,10 +82,10 @@ else
|
|||||||
SOURCE=$(dpkg-parsechangelog |grep ^Source|awk '{print $2}')
|
SOURCE=$(dpkg-parsechangelog |grep ^Source|awk '{print $2}')
|
||||||
cd - &> /dev/null
|
cd - &> /dev/null
|
||||||
if test "$SOURCE" != "llvm-toolchain-snapshot"; then
|
if test "$SOURCE" != "llvm-toolchain-snapshot"; then
|
||||||
echo "Checkout of the master is only available for llvm-toolchain-snapshot"
|
echo "Checkout of the main is only available for llvm-toolchain-snapshot"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
BRANCH="master"
|
BRANCH="main"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test -n "$1" -a -n "$2"; then
|
if test -n "$1" -a -n "$2"; then
|
||||||
@ -124,14 +124,14 @@ if test -z "$TAG" -a -z "$FINAL_RELEASE"; then
|
|||||||
# Building a branch
|
# Building a branch
|
||||||
git checkout $BRANCH
|
git checkout $BRANCH
|
||||||
git reset --hard origin/$BRANCH
|
git reset --hard origin/$BRANCH
|
||||||
if test $BRANCH != "master"; then
|
if test $BRANCH != "main"; then
|
||||||
VERSION=$(echo $BRANCH|cut -d/ -f2|cut -d. -f1)
|
VERSION=$(echo $BRANCH|cut -d/ -f2|cut -d. -f1)
|
||||||
if ! echo "$MAJOR_VERSION"|grep -q "$VERSION"; then
|
if ! echo "$MAJOR_VERSION"|grep -q "$VERSION"; then
|
||||||
echo "mismatch in version: Dir=$MAJOR_VERSION Provided=$VERSION"
|
echo "mismatch in version: Dir=$MAJOR_VERSION Provided=$VERSION"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
# No argument, take master. So, it can only be snapshot
|
# No argument, take main. So, it can only be snapshot
|
||||||
VERSION=$MAJOR_VERSION
|
VERSION=$MAJOR_VERSION
|
||||||
MAJOR_VERSION=snapshot
|
MAJOR_VERSION=snapshot
|
||||||
fi
|
fi
|
||||||
|
Loading…
Reference in New Issue
Block a user