mirror/libretro-super
1
0
Fork 0
mirror of https://github.com/libretro/libretro-super synced 2025-01-27 15:35:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #658 from orbea/update

Browse Source 
libretro-buildbot-recipe.sh: Use the correct .git directory.
This commit is contained in:
Andrés 2017-12-22 18:11:58 -05:00 committed by GitHub
commit be925301fd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
libretro-buildbot-recipe.sh
View File

@ -624,19 +624,25 @@ while read line; do
fi fi
fi fi
cd "$DIR" || { echo "Failed to cd to ${DIR}, skipping ${NAME}"; continue; } CURRENT_BRANCH="$(git --work-tree="$DIR" --git-dir="$DIR/.git" rev-parse --abbrev-ref HEAD)"
CURRENT_BRANCH="$(git rev-parse --abbrev-ref HEAD)"
if [ "${GIT_BRANCH}" != "${CURRENT_BRANCH}" ] && [ "${TRAVIS:-0}" = "0" ]; then if [ "${GIT_BRANCH}" != "${CURRENT_BRANCH}" ] && [ "${TRAVIS:-0}" = "0" ]; then
echo "Changing to the branch ${GIT_BRANCH} from ${CURRENT_BRANCH}" echo "Changing to the branch ${GIT_BRANCH} from ${CURRENT_BRANCH}"
git remote set-branches origin "${GIT_BRANCH}" git --work-tree="$DIR" --git-dir="$DIR/.git" remote set-branches origin "${GIT_BRANCH}"
git fetch --depth 1 origin "${GIT_BRANCH}" git --work-tree="$DIR" --git-dir="$DIR/.git" fetch --depth 1 origin "${GIT_BRANCH}"
git checkout "${GIT_BRANCH}" git --work-tree="$DIR" --git-dir="$DIR/.git" checkout "${GIT_BRANCH}"
git branch -D "${CURRENT_BRANCH}" git --work-tree="$DIR" --git-dir="$DIR/.git" branch -D "${CURRENT_BRANCH}"
BUILD="YES" BUILD="YES"
fi fi
(
cd -- "$DIR" || { echo "Failed to cd to ${DIR}, skipping ${NAME}"; continue; }
if git config --file .gitmodules --name-only --get-regexp path 2>&1 >/dev/null; then
git --work-tree="." --git-dir=".git" submodule update --init --recursive
fi
)
for core in 81 emux_nes emux_sms fuse gw mgba; do for core in 81 emux_nes emux_sms fuse gw mgba; do
if [ "${PREVCORE}" = "$core" ] && [ "${PREVBUILD}" = "YES" ] && [ "${NAME}" = "$core" ]; then if [ "${PREVCORE}" = "$core" ] && [ "${PREVBUILD}" = "YES" ] && [ "${NAME}" = "$core" ]; then
FORCE="YES" FORCE="YES"
@ -644,12 +650,6 @@ while read line; do
fi fi
done done
if git config --file .gitmodules --name-only --get-regexp path 2>&1 >/dev/null; then
git submodule update --init --recursive
fi
cd "$WORK"
if [ "${BUILD}" = "YES" ] || [ "${FORCE}" = "YES" ]; then if [ "${BUILD}" = "YES" ] || [ "${FORCE}" = "YES" ]; then
touch $TMPDIR/built-cores touch $TMPDIR/built-cores
CORES_BUILT=YES CORES_BUILT=YES