srenblad
/
artiq
forked from M-Labs/artiq
1
0
Fork 0
Code Pull Requests Activity
1,709 Commits 63 Branches 34 Tags 19 MiB
Commit Graph

36 Commits

Author SHA1 Message Date
Sebastien Bourdeauducq 56281c1a5c Revert "travis/get-xilinx: use http github clone url" 
This reverts commit d06a4d60a8.
 2015-11-04 18:03:50 +08:00
Sebastien Bourdeauducq d06a4d60a8 travis/get-xilinx: use http github clone url 2015-11-04 18:00:31 +08:00
Sebastien Bourdeauducq 649069980a conda,travis: use new SoC build system 2015-11-04 16:01:03 +08:00
whitequark 8374e8d33e conda: add artiq-pipistrello-nist_qc1. 2015-10-22 15:43:41 +03:00
whitequark f3e61e265c conda: move everything except artiq to conda-recipes (closes #138). 2015-10-16 07:06:22 +03:00
whitequark 6b9cc5a17c Revert "travis: export llvm-or1k lib/ in LD_LIBRARY_PATH." 
This reverts commit 6d0ec2f01d.
 2015-10-14 14:49:40 +03:00
whitequark 6d0ec2f01d travis: export llvm-or1k lib/ in LD_LIBRARY_PATH. 
The llvm-or1k build that is currently used is dynamically linked,
and in case llvmlite-artiq is linked with this llvm-or1k,
this is necessary to run ARTIQ.
 2015-10-10 03:50:58 +03:00
whitequark db061bc43d Revert "travis: use main conda m-labs channel." 
This reverts commit 87b573c813.
 2015-10-09 20:21:25 +03:00
whitequark a9230d33f2 conda: skip bitstream builds if BUILD_SOC=0. 2015-10-09 16:52:30 +03:00
whitequark 87b573c813 travis: use main conda m-labs channel. 2015-10-09 15:21:50 +03:00
Sebastien Bourdeauducq 342e72bed6 more travis fixing attempts 2015-10-05 00:09:36 +08:00
Sebastien Bourdeauducq 322cf54aeb travis: yet another attempt at fixing py35 installation (4)... 2015-10-04 23:33:50 +08:00
Sebastien Bourdeauducq 0279e2110a travis: yet another attempt at fixing py35 installation (3)... 2015-10-04 23:29:01 +08:00
Sebastien Bourdeauducq 8db4d7a5f9 travis: yet another attempt at fixing py35 installation (2)... 2015-10-04 23:25:02 +08:00
Sebastien Bourdeauducq 3dfbceb5c6 travis: yet another attempt at fixing py35 installation... 2015-10-04 23:19:56 +08:00
Sebastien Bourdeauducq eaa317e08f travis: switch to py3.5 sooner 2015-10-04 23:16:40 +08:00
Sebastien Bourdeauducq fcb668f465 travis,conda: python 3.5 2015-10-04 23:03:31 +08:00
Robert Jördens 01416bb0be copyright: claim contributions 
These are contributions of >= 30% or >= 20 lines (half-automated).

I hereby resubmit all my previous contributions to the ARTIQ project
under the following terms:

    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation, either version 3 of the License, or
    (at your option) any later version.

    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.

    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.

Closes #130

Signed-off-by: Robert Jordens <jordens@gmail.com>
 2015-09-06 16:08:57 -06:00
Yann Sionneau 4a907dcb33 conda: add binutils-or1k-linux dependency to artiq package 2015-09-01 12:13:24 +02:00
Yann Sionneau cf74cd0f38 travis: dont overwrite conda env PATH, escape dollar signs, fixes #84 2015-08-14 19:00:08 +02:00
Yann Sionneau e6f3285144 travis: use the new m-labs anaconda repository during CI 2015-08-14 18:19:01 +02:00
whitequark 905abd6e27 get-toolchain.sh: be less verbose. 2015-07-27 04:57:13 +03:00
whitequark d252a00b56 Add prebuilt or1k-linux binutils and or1k llvm for travis. 2015-07-26 14:12:48 +03:00
Yann Sionneau 01ca6ebb1c binstar.org is becoming anaconda.org 2015-07-10 16:30:14 +02:00
Robert Jördens dd2c1d1b72 travis: try again with latest conda 2015-06-25 13:50: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 b820b7a3e1 Revert "travis: use latest miniconda" 
Seems to segfault on travis.

This reverts commit 51eb835030.
 2015-06-25 12:56:50 -06:00
Robert Jördens 51eb835030 travis: use latest miniconda 2015-06-25 12:50:09 -06:00
Robert Jördens 1c7ab97b91 travis: cleanup unused/redundant env vars 2015-06-25 12:40:04 -06:00
Robert Jördens 31d551e619 travis: cleanup get-xilinx.sh a bit 2015-06-25 12:35:50 -06: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 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
Robert Jördens ef3804a471 travis: refactor get-misoc.sh 2015-02-05 22:50:55 -07:00
Robert Jördens 0a91f86b06 add .travis.yml 2015-02-05 11:38:30 +08:00