Skip to content

Commit ba96619

Browse files
committed
Revert changes to conda config
1 parent fb89389 commit ba96619

File tree

4 files changed

+26
-13
lines changed

4 files changed

+26
-13
lines changed

.github/actions_build_conda.sh

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,19 @@ set -e -x
55

66
python -m mkrecipe --type wheel || exit 1
77

8-
$CONDA/bin/conda config --set always_yes yes --set changeps1 no
9-
$CONDA/bin/conda install conda-build
10-
$CONDA/bin/conda install anaconda-client
11-
$CONDA/bin/conda info -a
8+
# Switch to miniconda
9+
source "/home/runner/miniconda/etc/profile.d/conda.sh"
10+
hash -r
11+
conda activate base
12+
conda config --set always_yes yes --set changeps1 no
13+
conda update -q conda
14+
conda install conda-build
15+
conda install anaconda-client
16+
conda info -a
1217

13-
$CONDA/bin/conda config --add channels conda-forge || exit 1
14-
$CONDA/bin/conda config --add channels domdfcoding || exit 1
18+
conda config --add channels conda-forge || exit 1
19+
conda config --add channels domdfcoding || exit 1
1520

16-
$CONDA/bin/conda build conda -c conda-forge -c domdfcoding --output-folder conda/dist --skip-existing
21+
conda build conda -c conda-forge -c domdfcoding --output-folder conda/dist --skip-existing
1722

1823
exit 0

.github/actions_deploy_conda.sh

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,21 @@
33

44
set -e -x
55

6-
$CONDA/bin/conda config --set always_yes yes --set changeps1 no
7-
$CONDA/bin/conda update -q conda
8-
$CONDA/bin/conda install anaconda-client
9-
$CONDA/bin/conda info -a
6+
# Switch to miniconda
7+
source "/home/runner/miniconda/etc/profile.d/conda.sh"
8+
hash -r
9+
conda activate base
10+
conda config --set always_yes yes --set changeps1 no
11+
conda update -q conda
12+
conda install anaconda-client
13+
conda info -a
1014

1115
for f in conda/dist/noarch/seed_intersphinx_mapping-*.tar.bz2; do
1216
[ -e "$f" ] || continue
1317
echo "$f"
14-
$CONDA/bin/conda install "$f" || exit 1
18+
conda install "$f" || exit 1
1519
echo "Deploying to Anaconda.org..."
16-
$CONDA/bin/anaconda -t "$ANACONDA_TOKEN" upload "$f" || exit 1
20+
anaconda -t "$ANACONDA_TOKEN" upload "$f" || exit 1
1721
echo "Successfully deployed to Anaconda.org."
1822
done
1923

.github/workflows/conda_ci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ jobs:
3030
python -m pip install --upgrade pip setuptools wheel
3131
python -m pip install --upgrade repo_helper
3232
# $CONDA is an environment variable pointing to the root of the miniconda directory
33+
$CONDA/bin/conda update -q conda
3334
$CONDA/bin/conda install conda-build=3.21.0
3435
3536
$CONDA/bin/conda config --add channels conda-forge

.github/workflows/python_ci_linux.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,9 @@ jobs:
168168
python -m pip install --upgrade pip setuptools wheel
169169
python -m pip install --upgrade mkrecipe
170170
171+
wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh
172+
bash miniconda.sh -b -p $HOME/miniconda
173+
171174
- name: Build Conda 📦
172175
run: |
173176
chmod +x .github/actions_build_conda.sh

0 commit comments

Comments
 (0)