Skip to content

Commit

Permalink
Fix: CI scripts 1.1.1 instead of master in Azure (#55)
Browse files Browse the repository at this point in the history
Was using the master branch by mistake in Azure Pipelines.
  • Loading branch information
leouieda committed Mar 22, 2019
1 parent 4bdb48a commit 0dfd310
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 12 deletions.
4 changes: 1 addition & 3 deletions .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,13 @@ init:
# The files with the listed requirements to be installed by setup-miniconda.bat
- set CONDA_REQUIREMENTS=requirements.txt
- set CONDA_REQUIREMENTS_DEV=requirements-dev.txt
# Cartopy, scipy, and proj aren't on conda-forge for some reason.
- set CONDA_EXTRA_CHANNEL=defaults

install:
# Copy sample data to the verde data dir to avoid downloading all the time
- ps: mkdir -p ~\.harmonica\data\master
- ps: cp data\* ~\.harmonica\data\master
# Get the Fatiando CI scripts
- cmd: git clone --branch=1.1.0 --depth=1 https://github.com/fatiando/continuous-integration.git
- cmd: git clone --branch=1.1.1 --depth=1 https://github.com/fatiando/continuous-integration.git
# Setup miniconda and install the requirements into a new environment
- cmd: continuous-integration\appveyor\setup-miniconda.bat
# Activate the new environment
Expand Down
14 changes: 6 additions & 8 deletions .azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ jobs:
- bash: echo "##vso[task.prependpath]/usr/share/miniconda/bin"
displayName: Add conda to PATH

# Get the Fatiando CI scripts (replace "master" with the version you want to use)
- bash: git clone --branch=1.1.0 --depth=1 https://github.com/fatiando/continuous-integration.git
# Get the Fatiando CI scripts
- bash: git clone --branch=1.1.1 --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 @@ -92,8 +92,8 @@ jobs:
- bash: echo "##vso[task.prependpath]$CONDA/bin"
displayName: Add conda to PATH

# Get the Fatiando CI scripts (replace "master" with the version you want to use)
- bash: git clone --branch=master --depth=1 https://github.com/fatiando/continuous-integration.git
# Get the Fatiando CI scripts
- bash: git clone --branch=1.1.1 --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 @@ -161,8 +161,6 @@ jobs:
CONDA_REQUIREMENTS: requirements.txt
CONDA_REQUIREMENTS_DEV: requirements-dev.txt
CONDA_INSTALL_EXTRA: "codecov"
# Cartopy, scipy, and proj aren't on conda-forge for some reason.
CONDA_EXTRA_CHANNEL: defaults

strategy:
matrix:
Expand All @@ -178,8 +176,8 @@ jobs:
- powershell: Write-Host "##vso[task.prependpath]$env:CONDA\Scripts"
displayName: Add conda to PATH

# Get the Fatiando CI scripts (replace "master" with the version you want to use)
- script: git clone --branch=master --depth=1 https://github.com/fatiando/continuous-integration.git
# Get the Fatiando CI scripts
- script: git clone --branch=1.1.1 --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 @@ -52,7 +52,7 @@ before_install:
- mkdir -p $HOME/.harmonica/data/master
- cp -r data/* $HOME/.harmonica/data/master
# Get the Fatiando CI scripts
- git clone --branch=1.1.0 --depth=1 https://github.com/fatiando/continuous-integration.git
- git clone --branch=1.1.1 --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 0dfd310

Please sign in to comment.