Verified Commit b3b789d4 authored by Adam Mercer's avatar Adam Mercer Committed by Adam Mercer
Browse files

Merge branch 'fix-conda-yaml-rename' into 'master'

Fix conda build failure

See merge request lscsoft/lalsuite!1406

(cherry picked from commit 23a9d225)
parent b766e859
......@@ -215,14 +215,14 @@ cache:
conda config --add channels conda-forge
retry conda update -n base conda setuptools
conda activate base
retry conda install -n base "conda-build!=3.18.10" conda-forge-pinning conda-smithy conda-verify
retry conda install -n base "conda-build!=3.18.10" conda-forge-pinning "conda-smithy>=3.7.5" conda-verify
conda info --all
.conda-build: &conda-build
image: igwn/base:conda
variables:
CONDA_BLD_PATH: "${CI_PROJECT_DIR}/conda/bld"
CONDA_CONFIG: "linux_"
CONDA_CONFIG: "linux_64_"
CONDA_PKGS_DIRS: "${CI_PROJECT_DIR}/conda/pkgs"
before_script:
- *define-retry
......@@ -419,7 +419,7 @@ lal:conda:fftw:
- make-dist
variables:
CONDA_BLD_PATH: "${CI_PROJECT_DIR}/conda/bld"
CONDA_CONFIG: "linux_fft_implfftw"
CONDA_CONFIG: "linux_64_fft_implfftw"
CONDA_PKGS_DIRS: "${CI_PROJECT_DIR}/conda/pkgs"
lal:conda:mkl:
......@@ -429,7 +429,7 @@ lal:conda:mkl:
- make-dist
variables:
CONDA_BLD_PATH: "${CI_PROJECT_DIR}/conda/bld"
CONDA_CONFIG: "linux_fft_implmkl"
CONDA_CONFIG: "linux_64_fft_implmkl"
CONDA_PKGS_DIRS: "${CI_PROJECT_DIR}/conda/pkgs"
# -- lalframe------------------------------------
......@@ -674,7 +674,7 @@ lalapps:conda:
- lalinference:conda
variables:
CONDA_BLD_PATH: "${CI_PROJECT_DIR}/conda/bld"
CONDA_CONFIG: "linux_python3.7.____cpython"
CONDA_CONFIG: "linux_64_python3.7.____cpython"
CONDA_PKGS_DIRS: "${CI_PROJECT_DIR}/conda/pkgs"
# -- integration tests --------------------------
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment