timvideos / HDMI2USB-fx2-firmware

HDMI2USB firmware for the Cypress FX2 found on the Digilent Atlys and Numato Opsis boards.
24 stars 11 forks source link

Audio data transfer #34

Closed paddatrapper closed 7 years ago

paddatrapper commented 7 years ago

~This is blocked by PR #23 as it is an extension of that work~. Generates a tone when flashed on an FX2

paddatrapper commented 7 years ago

Travis is failing with the following, seems to be an issue with the version_data.sh script. It fails on

git checkout $TRAVIS_COMMIT -b $TRAVIS_BRANCH

It seems to be an issue in Travis only, as building locally works fine. I'm not sure the solution.

make -C audio
make[1]: Entering directory `/home/travis/build/timvideos/HDMI2USB-fx2-firmware/audio'
     GEN  version_data.h
remote: Counting objects: 564, done.
remote: Compressing objects: 100% (187/187), done.
remote: Total 564 (delta 266), reused 551 (delta 257), pack-reused 0
Receiving objects: 100% (564/564), 130.73 KiB | 0 bytes/s, done.
Resolving deltas: 100% (266/266), completed with 14 local objects.
Fixing detached head
* (HEAD detached at e0c22de) e0c22de Merge 950615fc869f350033dccd3937895135be0b4826 into c84892ecc756d98e0e7640b0799cf0ffb89c2073
  master                     c84892e Merge pull request #37 from paddatrapper/version-embed
Deleted branch master (was c84892e).
fatal: reference is not a tree: 75bebb54743bae46e16e6e7e460f30270429500b
make[1]: *** [version_data.h] Error 128
make[1]: Leaving directory `/home/travis/build/timvideos/HDMI2USB-fx2-firmware/audio'
make: *** [audio/audio.hex] Error 2
mithro commented 7 years ago

So, this is a weirdness of Travis the commit you are trying to checkout doesn't exist in the tree.

mithro commented 7 years ago

So, https://github.com/timvideos/HDMI2USB-litex-firmware/blob/master/.travis/setup.sh does the following,

echo ""
echo ""
echo ""
echo "- Fetching non shallow to get git version"
echo "---------------------------------------------"
git fetch --unshallow && git fetch --tags
if [ z"$TRAVIS_BRANCH" != z ]; then
    echo "Fixing detached head"
    git branch -v
    git branch -D $TRAVIS_BRANCH || true
    git checkout $TRAVIS_COMMIT -b $TRAVIS_BRANCH
    git branch -v
fi
GIT_REVISION=`git describe`
echo "============================================="
paddatrapper commented 7 years ago

We do the same and that checkout is what is failing

https://github.com/timvideos/HDMI2USB-fx2-firmware/blob/master/common/version_data.sh#L11

mithro commented 7 years ago

I can't find the commit 75bebb54743bae46e16e6e7e460f30270429500b anywhere in repos...

paddatrapper commented 7 years ago

This is now ready for review and merge

paddatrapper commented 7 years ago

Travis and version_data.h again...