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: 52030ab1b74f
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: dd2c1d1b72a0
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Jun 25, 2015

  1. Copy the full SHA
    48e0a2a View commit details
  2. Copy the full SHA
    dd2c1d1 View commit details
Showing with 4 additions and 1 deletion.
  1. +1 −1 .travis/get-anaconda.sh
  2. +3 −0 artiq/frontend/artiq_flash.sh
2 changes: 1 addition & 1 deletion .travis/get-anaconda.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/sh

export PATH=$HOME/miniconda/bin:$PATH
wget http://repo.continuum.io/miniconda/Miniconda3-3.7.3-Linux-x86_64.sh -O miniconda.sh
wget http://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh
bash miniconda.sh -b -p $HOME/miniconda
hash -r
conda config --set always_yes yes --set changeps1 no
3 changes: 3 additions & 0 deletions artiq/frontend/artiq_flash.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
#!/bin/bash

# exit on error
set -e
# print commands
set -v

ARTIQ_PREFIX=$(python3 -c "import artiq; print(artiq.__path__[0])")