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: 57ae630c5c20
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: 07ef8906f437
Choose a head ref
  • 2 commits
  • 7 files changed
  • 1 contributor

Commits on Jan 5, 2016

  1. conda: use BUILDNUMBER from environment.

    whitequark committed Jan 5, 2016
    Copy the full SHA
    ff09a98 View commit details

  2. conda: fix buildscripts to get bscan bitstreams correctly.

    whitequark committed Jan 5, 2016
    Copy the full SHA
    07ef890 View commit details
2 changes: 1 addition & 1 deletion conda/artiq-kc705-nist_qc1/build.sh
View file
Original file line number Diff line number Diff line change
@@ -11,5 +11,5 @@ cp misoc_nist_qc1_kc705/gateware/top.bit $SOC_PREFIX
cp misoc_nist_qc1_kc705/software/bios/bios.bin $SOC_PREFIX
cp misoc_nist_qc1_kc705/software/runtime/runtime.fbi $SOC_PREFIX

wget https://github.com/jordens/bscan_spi_bitstreams/blob/master/bscan_spi_xc7k325t.bit?raw=true
wget https://github.com/jordens/bscan_spi_bitstreams/blob/master/bscan_spi_xc7k325t.bit?raw=true -O bscan_spi_xc7k325t.bit
mv bscan_spi_xc7k325t.bit $SOC_PREFIX
2 changes: 1 addition & 1 deletion conda/artiq-kc705-nist_qc1/meta.yaml
View file
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@ source:

build:
noarch_python: true
number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
number: {{ environ.get("BUILDNUMBER", 9999) }}
string: py_{{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}+git{{ environ.get("GIT_DESCRIBE_HASH", "")[1:] }}

requirements:
2 changes: 1 addition & 1 deletion conda/artiq-kc705-nist_qc2/build.sh
View file
Original file line number Diff line number Diff line change
@@ -11,5 +11,5 @@ cp misoc_nist_qc2_kc705/gateware/top.bit $SOC_PREFIX
cp misoc_nist_qc2_kc705/software/bios/bios.bin $SOC_PREFIX
cp misoc_nist_qc2_kc705/software/runtime/runtime.fbi $SOC_PREFIX

wget https://github.com/jordens/bscan_spi_bitstreams/blob/master/bscan_spi_xc7k325t.bit?raw=true
wget https://github.com/jordens/bscan_spi_bitstreams/blob/master/bscan_spi_xc7k325t.bit?raw=true -O bscan_spi_xc7k325t.bit
mv bscan_spi_xc7k325t.bit $SOC_PREFIX
2 changes: 1 addition & 1 deletion conda/artiq-kc705-nist_qc2/meta.yaml
View file
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@ source:

build:
noarch_python: true
number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
number: {{ environ.get("BUILDNUMBER", 9999) }}
string: py_{{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}+git{{ environ.get("GIT_DESCRIBE_HASH", "")[1:] }}

requirements:
2 changes: 1 addition & 1 deletion conda/artiq-pipistrello-nist_qc1/build.sh
View file
Original file line number Diff line number Diff line change
@@ -11,5 +11,5 @@ cp misoc_nist_qc1_pipistrello/gateware/top.bit $SOC_PREFIX
cp misoc_nist_qc1_pipistrello/software/bios/bios.bin $SOC_PREFIX
cp misoc_nist_qc1_pipistrello/software/runtime/runtime.fbi $SOC_PREFIX

wget https://github.com/jordens/bscan_spi_bitstreams/blob/master/bscan_spi_xc6slx45.bit?raw=true
wget https://github.com/jordens/bscan_spi_bitstreams/blob/master/bscan_spi_xc6slx45.bit?raw=true -O bscan_spi_xc6slx45.bit
mv bscan_spi_xc6slx45.bit $SOC_PREFIX
2 changes: 1 addition & 1 deletion conda/artiq-pipistrello-nist_qc1/meta.yaml
View file
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@ source:

build:
noarch_python: true
number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
number: {{ environ.get("BUILDNUMBER", 9999) }}
string: py_{{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}+git{{ environ.get("GIT_DESCRIBE_HASH", "")[1:] }}

requirements:
2 changes: 1 addition & 1 deletion conda/artiq/meta.yaml
View file
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@ source:

build:
noarch_python: true
number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
number: {{ environ.get("BUILDNUMBER", 9999) }}
string: py_{{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}+git{{ environ.get("GIT_DESCRIBE_HASH", "")[1:] }}
entry_points:
- artiq_client = artiq.frontend.artiq_client:main