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: f626a73fcd29
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: e362df9aa4e2
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Jul 22, 2017

  1. travis: Even more logging.

    @mithro
    mithro committed Jul 22, 2017

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    25605a0 View commit details

  2. travis: Skip if platform output doesn't exist.

    @mithro
    mithro committed Jul 22, 2017
    Copy the full SHA
    e362df9 View commit details
Showing with 28 additions and 17 deletions.
  1. +28 −17 .travis/build.sh
45 changes: 28 additions & 17 deletions .travis/build.sh
View file
Original file line number Diff line number Diff line change
@@ -338,24 +338,33 @@ 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
for i in 1 2 3 4 5 6 7 8 9 10; do # Try 10 times.
if [ "$TRAVIS_BRANCH" = "master" ]; then
echo
echo "Updating unstable link"
echo "---------------------------------------------"
for PLATFORM in $PLATFORMS; do
(
if [ ! -d "$PLATFORM/firmware" ]; then
continue
fi
cd $PLATFORM/firmware
LATEST="$(ls ../../archive/master/ | tail -n 1)"
HDMI2USB_FIRMWARE="$LATEST/$PLATFORM/hdmi2usb/lm32"
if [ -d "$HDMI2USB_FIRMWARE" ]; then
echo "Changing $PLATFORM from '$(readlink unstable)' to '$HDMI2USB_FIRMWARE'"
ln -sf unstable "$HDMI2USB_FIRMWARE"
git add unstable
else
echo "Not updating $PLATFORM"
fi
)
done
fi
echo
echo "Changes to be pushed"
echo "---------------------------------------------"
git diff origin/master --stat=1000,1000
echo
echo "Pushing"
echo "---------------------------------------------"
@@ -367,6 +376,8 @@ if [ ! -z "$PREBUILT_DIR" ]; then
git fetch
git merge origin/master -m "Merging #$TRAVIS_JOB_NUMBER of $GIT_REVISION"
done
echo
echo "Push finished!"
)
fi