Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: timvideos/HDMI2USB-litex-firmware
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 64972e6b7100
Choose a base ref
...
head repository: timvideos/HDMI2USB-litex-firmware
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f626a73fcd29
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Jul 22, 2017

  1. travis: Update the unstable symlink on every build.

    @mithro
    mithro committed Jul 22, 2017
    Copy the full SHA
    51de969 View commit details

  2. travis: Adding better logging.

    @mithro
    mithro committed Jul 22, 2017
    Copy the full SHA
    f626a73 View commit details
Showing with 24 additions and 1 deletion.
  1. +24 −1 .travis/build.sh
25 changes: 24 additions & 1 deletion .travis/build.sh
View file
Original file line number Diff line number Diff line change
@@ -338,9 +338,32 @@ if [ ! -z "$PREBUILT_DIR" ]; then
echo "============================================="
(
cd $PREBUILT_DIR
if [ "$TRAVIS_BRANCH" = "master" ]; then
for PLATFORM in $PLATFORMS; do
(
cd $PLATFORM/firmware
LATEST="$(ls ../../archive/master/ | tail -n 1)"
HDMI2USB_FIRMWARE="$LATEST/$PLATFORM/hdmi2usb/lm32"
if [ -d "$HDMI2USB_FIRMWARE" ]; then
ln -sf unstable "$HDMI2USB_FIRMWARE"
git add unstable
fi
)
done
fi
echo
echo "Changes to be pushed"
echo "---------------------------------------------"
git diff origin/master --stat=1000,1000
while true; do
for i in 1 2 3 4 5 6 7 8 9 10; do # Try 10 times.
echo
echo "Pushing"
echo "---------------------------------------------"
git push --quiet origin master > /dev/null 2>&1 && break
echo
echo "Merging"
echo "---------------------------------------------"
git diff --stat origin/master && break
git fetch
git merge origin/master -m "Merging #$TRAVIS_JOB_NUMBER of $GIT_REVISION"
done