Skip to content

Commit

Permalink
Update continuous integration scripts to 1.2.0 (#355)
Browse files Browse the repository at this point in the history
Fixes randomly failing Azure Mac builds. 
See release notes at https://github.com/fatiando/continuous-integration/releases/tag/1.2.0.
  • Loading branch information
weiji14 authored and leouieda committed Oct 31, 2019
1 parent 882dbba commit b8bbcfd
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 4 deletions.
12 changes: 9 additions & 3 deletions .azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
displayName: Add conda to PATH

# Get the Fatiando CI scripts
- bash: git clone --branch=1.1.1 --depth=1 https://github.com/fatiando/continuous-integration.git
- bash: git clone --branch=1.2.0 --depth=1 https://github.com/fatiando/continuous-integration.git
displayName: Fetch the Fatiando CI scripts

# Setup dependencies and build a conda environment
Expand Down Expand Up @@ -94,9 +94,15 @@ jobs:
displayName: Add conda to PATH

# Get the Fatiando CI scripts
- bash: git clone --branch=1.1.1 --depth=1 https://github.com/fatiando/continuous-integration.git
- bash: git clone --branch=1.2.0 --depth=1 https://github.com/fatiando/continuous-integration.git
displayName: Fetch the Fatiando CI scripts

# On Hosted macOS, the agent user doesn't have ownership of Miniconda's installation
# directory. We need to take ownership if we want to update conda or install packages
# globally.
- bash: sudo chown -R $USER $CONDA
displayName: Take ownership of conda installation

# Setup dependencies and build a conda environment
- bash: source continuous-integration/azure/setup-miniconda.sh
displayName: Setup Miniconda
Expand Down Expand Up @@ -179,7 +185,7 @@ jobs:
displayName: Add conda to PATH

# Get the Fatiando CI scripts
- script: git clone --branch=1.1.1 --depth=1 https://github.com/fatiando/continuous-integration.git
- script: git clone --branch=1.2.0 --depth=1 https://github.com/fatiando/continuous-integration.git
displayName: Fetch the Fatiando CI scripts

# Setup dependencies and build a conda environment
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ matrix:

before_install:
# Get the Fatiando CI scripts
- git clone --branch=1.1.1 --depth=1 https://github.com/fatiando/continuous-integration.git
- git clone --branch=1.2.0 --depth=1 https://github.com/fatiando/continuous-integration.git
# Download and install miniconda and setup dependencies
# Need to source the script to set the PATH variable globaly
- source continuous-integration/travis/setup-miniconda.sh
Expand Down

0 comments on commit b8bbcfd

Please sign in to comment.