M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 1
Code Issues Projects Releases Wiki Activity
2,026 Commits 13 Branches 35 Tags 27 MiB
Commit Graph

45 Commits

Author SHA1 Message Date
whitequark d6d0a3e3e9 Merge branch 'master' into new-py2llvm 2015-11-07 12:57:18 +03:00
Sebastien Bourdeauducq 649069980a conda,travis: use new SoC build system 2015-11-04 16:01:03 +08:00
whitequark f70f7fb89b Merge branch 'master' into new-py2llvm 2015-10-30 04:29:35 +03:00
whitequark 026504e578 conda: add artiq-kc705-nist_qc[12]. 2015-10-22 16:01:12 +03:00
whitequark 8374e8d33e conda: add artiq-pipistrello-nist_qc1. 2015-10-22 15:43:41 +03:00
whitequark 8b78fe492a conda: build noarch package without bitstreams. 2015-10-22 13:42:05 +03:00
Sebastien Bourdeauducq eb546bf4a0 conda: make package noarch 2015-10-20 18:49:27 +08:00
whitequark bd5b324fc2 Merge branch 'master' into new-py2llvm 2015-10-13 19:24:45 +03:00
whitequark a9230d33f2 conda: skip bitstream builds if BUILD_SOC=0. 2015-10-09 16:52:30 +03:00
whitequark 0cc8f19b6b travis: expand matrix to run a build with BUILD_SOC=0. 
BUILD_SOC=1 build takes over 40 minutes, most of them spent
in Xilinx tools, which means all the other changes cannot
be tested quickly.
 2015-10-09 16:14:13 +03:00
Sebastien Bourdeauducq 342e72bed6 more travis fixing attempts 2015-10-05 00:09:36 +08:00
Sebastien Bourdeauducq fcb668f465 travis,conda: python 3.5 2015-10-04 23:03:31 +08:00
whitequark 3e1348a084 Merge branch 'master' of github.com:m-labs/artiq into new-py2llvm 2015-09-27 18:22:28 +03:00
Yann Sionneau c9236870bd travis: do not upload conda package if branch is not master. fixes #55 2015-08-21 18:47:58 +02:00
Yann Sionneau c6bba4d5eb Revert "conda: give 10 more minutes to ISE to achieve routing" 
This reverts commit e6cc0419e5.
 2015-08-20 13:03:09 +02:00
Yann Sionneau e6cc0419e5 conda: give 10 more minutes to ISE to achieve routing 2015-08-20 12:33:55 +02:00
Yann Sionneau c94dafdeca Revert "travis: use more recent libstdc++" 
This reverts commit 075bf331ac.
This is no longer needed since the llvmlite-artiq package for
linux-64 has been rebuilt on an older Ubuntu (14.04 LTS)
 2015-08-17 17:51:36 +02:00
Yann Sionneau 075bf331ac travis: use more recent libstdc++ 2015-08-11 14:05:41 +02:00
Sebastien Bourdeauducq 4df2001874 travis: try to use the new anaconda-client 2015-07-31 13:50:35 +08:00
whitequark c581af29d7 Merge remote-tracking branch 'origin/master' into new-py2llvm 2015-07-23 21:36:17 +03:00
Robert Jördens 19442efdae travis: binstar takes -q before command... 2015-07-04 23:19:08 -06:00
Robert Jördens fbdc0504d8 travis: logout of binstar after upload 2015-07-04 22:52:09 -06:00
Robert Jördens 096c72242e travis: shut up conda and binstar progress bars 2015-07-04 22:48:34 -06:00
Robert Jördens e056438cef travis: remove gitter webhook 2015-07-04 22:09:20 -06:00
Robert Jördens f6e8537db9 travis: add email-notification for hardware-ci 2015-07-04 22:09:04 -06:00
Robert Jördens 0f06bac701 travis: use "use-local" for conda install 
http://conda.pydata.org/docs/build_tutorials/pkgs.html
 2015-06-29 14:18:38 -06:00
Robert Jördens 52030ab1b7 travis: export MACADDR, do not source get-xilinx 2015-06-25 13:08:56 -06:00
Robert Jördens 1c7ab97b91 travis: cleanup unused/redundant env vars 2015-06-25 12:40:04 -06:00
whitequark 56bba3009d Only build the master branch on Travis. 2015-06-13 09:34:31 +03:00
Yann Sionneau 1530f9f457 travis: generate kc705 and pipistrello binaries in container env 2015-05-21 00:19:06 +08:00
Yann Sionneau 0f9bc7bc4b travis: conda-build and jinja2 must be installed in the root environment 2015-05-12 13:56:29 +02:00
Yann Sionneau fb8ccbd2a3 travis: install all conda dependencies at the same time 2015-05-11 09:33:30 +02:00
Yann Sionneau bf935baabb travis: install cython via conda to save time 2015-04-22 15:50:06 +08:00
Robert Jördens fb91955260 tests: make hardware-in-the loop flags positive logic 
Explicitly having to disable unittests that require hardware
(ARTIQ_NO_HARDWARE) is cumbersome.
There is not even a sensible default for the
device or serial number of the devices requiring additional
variables (ARTIQ_LDA_DEVICE etc).

This patch reverts the logic by skipping unittests that
can not automatically determine whether the required hardware
is present and where it is.
 2015-04-03 11:51:03 +08:00
Yann Sionneau e7be00baa8 Add support for automatic build and upload of dev conda artiq packages to binstar by travis-ci 
- SoC+BIOS are also built and integrated in the conda package
- artiq_flash.sh script is embedded to allow flashing ppro board
 2015-03-30 19:51:52 +08:00
Sebastien Bourdeauducq da917f768e initial kc705 support 2015-02-26 21:50:52 -07:00
Robert Jördens c97946a71c travis.yml: don't build bitstream for pull requests 2015-02-05 22:50:55 -07:00
Robert Jördens ef3804a471 travis: refactor get-misoc.sh 2015-02-05 22:50:55 -07:00
Robert Jördens 411f716960 travis.yml: reduce irc noise 2015-02-05 22:50:52 -07:00
Robert Jördens a06164e4ce travis.yml: build bitstream only if [soc] in commit message 2015-02-05 22:10:46 -07:00
Robert Jördens 50c14db17a doc/manual: mock up external modules for sphinx-autodoc 2015-02-05 04:31:35 -07:00
Robert Jördens 1dd5c28005 travis: install h5py, pyserial, dateutil from conda 2015-02-05 03:06:39 -07:00
Robert Jördens d2914f38b6 travis.yml: update secret 2015-02-05 02:55:16 -07:00
Sebastien Bourdeauducq ebf5699adf travis: use m-labs IRC channel 2015-02-05 11:40:33 +08:00
Robert Jördens 0a91f86b06 add .travis.yml 2015-02-05 11:38:30 +08:00