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

35 Commits

Author SHA1 Message Date
whitequark c9b20a1765 Commit missing parts of 0d0ddf2e. 2017-04-20 16:53:16 +00:00
whitequark 0d0ddf2e58 conda: limit git hashes in build numbers to 8 chars exactly. 
Before this commit, a nasty edge case was possible where repositories
on different builders have had different sets of objects fetched
into them, and so git-describe selected different lengths for
abbreviating hashes.

See also https://github.com/conda/conda-build/issues/1940.
 2017-04-20 16:40:10 +00:00
whitequark 3de19f6786 conda: use verbose misoc build. 2017-02-05 14:26:08 +00:00
Robert Jördens fb56c32d35 conda: use artiq-dev metapackage 2017-02-01 15:34:05 +01:00
whitequark c585784cd9 conda: bump misoc dependency. 2017-01-30 08:03:41 +00:00
Sebastien Bourdeauducq bff5f1b714 conda: update migen 2017-01-30 13:39:44 +08:00
Robert Jördens 9e92706d09 conda: pin misoc/migen package hashes 2017-01-27 14:43:24 +01:00
Sebastien Bourdeauducq fe53bab953 targets: kc705 -> kc705_dds 2017-01-05 18:40:56 +01:00
whitequark c45a170bb4 firmware: update for Rust 1.16.0. 2016-12-26 17:20:29 +00:00
Sebastien Bourdeauducq eb18466820 conda: use development version of migen/misoc 2016-11-20 22:56:48 +08:00
Robert Jördens 290498aca0 conda: misoc 0.4 (csr) 2016-10-12 16:34:19 +02:00
Sebastien Bourdeauducq 2701b914e2 conda: update migen version requirements 2016-09-24 21:02:19 +08:00
Robert Jördens 91b59cd584 conda: misoc 0.3 2016-08-26 14:01:00 +02:00
whitequark 4c6cad2977 Add a Rust component in the runtime. 2016-08-17 09:07:19 +00:00
whitequark 6c2ca69d4f conda: require misoc 0.2. 2016-08-16 07:08:35 +00:00
Sebastien Bourdeauducq ed1c368e73 gateware: name targets consistently. Closes #290 2016-04-05 16:07:29 +08:00
whitequark 1cfca74fcb conda: remove spurious artiq dep from gateware packages. 2016-02-14 13:35:40 +00:00
Robert Jördens 734fa593e4 conda bitstreams: depend on artiq 0.1 2016-02-14 14:21:31 +01:00
Robert Jördens 801b256d67 conda: use git_url 
needed for conda-build >= 0.19.0
 2016-02-14 02:21:07 +01:00
Sebastien Bourdeauducq 64263b75d0 use https for m-labs.hk 2016-02-10 17:20:29 +01:00
Robert Jördens 25ce0928bd build/doc: simplify proxy bitstream locations 2016-01-05 10:23:50 -07:00
whitequark 400999f6ad Revert "conda: use BUILDNUMBER from environment." 
This reverts commit ff09a982c5.
 2016-01-05 16:06:05 +00:00
whitequark 07ef8906f4 conda: fix buildscripts to get bscan bitstreams correctly. 2016-01-05 15:47:41 +00:00
whitequark ff09a982c5 conda: use BUILDNUMBER from environment. 2016-01-05 15:46:42 +00:00
Sebastien Bourdeauducq 57ae630c5c conda: package new, openocd-compatible flash proxy bitstreams 2016-01-05 21:02:13 +08:00
whitequark 272480cd26 Revert "conda: give up on build strings in dependencies." 
This reverts commit c0e040c4b9.
 2015-12-02 21:58:33 +08:00
whitequark 09647940a6 conda: use source from the current checkout. 2015-12-02 18:50:48 +08:00
Sebastien Bourdeauducq d4747a85f3 conda: use vivado for kc705 builds 2015-11-04 18:36:34 +08:00
Sebastien Bourdeauducq 4d0f500301 conda: update migen/misoc dependencies 2015-11-04 16:49:35 +08:00
Sebastien Bourdeauducq 649069980a conda,travis: use new SoC build system 2015-11-04 16:01:03 +08:00
whitequark c0e040c4b9 conda: give up on build strings in dependencies. 2015-10-29 01:24:39 +03:00
whitequark 372bc906c1 Revert "conda: work around conda/conda#1740." 
This just made conda recurse forever.

This reverts commit f384142869.
 2015-10-26 15:10:46 +03:00
whitequark f384142869 conda: work around conda/conda@1740. 2015-10-26 14:27:23 +03:00
Sebastien Bourdeauducq fd910faa38 change license to GPL in scripts 2015-10-23 09:09:45 +08:00
whitequark 026504e578 conda: add artiq-kc705-nist_qc[12]. 2015-10-22 16:01:12 +03:00