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: m-labs/artiq
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 17685d1e98ba
Choose a base ref
...
head repository: m-labs/artiq
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c97946a71c36
Choose a head ref
  • 4 commits
  • 2 files changed
  • 1 contributor

Commits on Feb 6, 2015

  1. Copy the full SHA
    a06164e View commit details
  2. travis.yml: reduce irc noise

    jordens committed Feb 6, 2015
    Copy the full SHA
    411f716 View commit details
  3. Copy the full SHA
    ef3804a View commit details
  4. Copy the full SHA
    c97946a View commit details
Showing with 15 additions and 7 deletions.
  1. +9 −7 .travis.yml
  2. +6 −0 .travis/get-misoc.sh
16 changes: 9 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -8,17 +8,16 @@ env:
- CC=gcc-4.7
- CXX=g++-4.7
- ARTIQ_NO_HARDWARE=1
- BUILD_SOC=0
- secure: "DUk/Ihg8KbbzEgPF0qrHqlxU8e8eET9i/BtzNvFddIGX4HP/P2qz0nk3cVkmjuWhqJXSbC22RdKME9qqPzw6fJwJ6dpJ3OR6dDmSd7rewavq+niwxu52PVa+yK8mL4yf1terM7QQ5tIRf+yUL9qGKrZ2xyvEuRit6d4cFep43Ws="
before_install:
- if echo "$TRAVIS_COMMIT_MSG" | grep -q "\[soc\]"; then BUILD_SOC=1; fi
- if [ $TRAVIS_PULL_REQUEST != false ]; then BUILD_SOC=0; fi
- ./.travis/get-toolchain.sh
- ./.travis/get-xilinx.sh
- if [ $BUILD_SOC -ne 0 ]; then ./.travis/get-xilinx.sh; fi
- ./.travis/get-anaconda.sh pip coverage numpy scipy sphinx h5py pyserial dateutil
- source $HOME/miniconda/bin/activate py34
- sudo apt-get install --force-yes -y iverilog
- pip install --src . -e 'git+https://github.com/m-labs/migen.git@master#egg=migen'
- mkdir vpi
- iverilog-vpi --name=vpi/migensim migen/vpi/main.c migen/vpi/ipc.c
- git clone --recursive https://github.com/m-labs/misoc
- ./.travis/get-misoc.sh
- pip install --src . -e 'git+https://github.com/nist-ionstorage/llvmlite.git@artiq#egg=llvmlite'
- pip install coveralls
install:
@@ -28,14 +27,17 @@ script:
- make -C doc/manual html
- cd misoc; python make.py -X ../soc -t artiq build-headers build-bios; cd ..
- make -C soc/runtime
- cd misoc; python make.py -X ../soc -t artiq build-bitstream; cd ..
- if [ $BUILD_SOC -ne 0 ]; then cd misoc; python make.py -X ../soc -t artiq build-bitstream; cd ..; fi
after_success:
coveralls
notifications:
email: false
irc:
channels:
- chat.freenode.net#m-labs
template:
- "%{repository}#%{build_number} (%{branch} - %{commit} : %{author}): %{message}"
- "Build details : %{build_url}"
webhooks:
urls:
- https://webhooks.gitter.im/e/d26782523952bfa53814
6 changes: 6 additions & 0 deletions .travis/get-misoc.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#!/bin/sh

sudo apt-get install --force-yes -y iverilog
pip install --src . -e 'git+https://github.com/m-labs/migen.git@master#egg=migen'
mkdir vpi && iverilog-vpi --name=vpi/migensim migen/vpi/main.c migen/vpi/ipc.c
git clone --recursive https://github.com/m-labs/misoc