From 6e1dd7b75823a01be79fd7ea7620de2f8862c602 Mon Sep 17 00:00:00 2001
From: Andreas Kloeckner <inform@tiker.net>
Date: Sat, 23 May 2020 17:55:48 -0500
Subject: [PATCH 1/4] Switch from miniconda to miniforge

---
 build-py-project-within-miniconda.sh | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/build-py-project-within-miniconda.sh b/build-py-project-within-miniconda.sh
index 304df8f..b9c09b2 100644
--- a/build-py-project-within-miniconda.sh
+++ b/build-py-project-within-miniconda.sh
@@ -56,32 +56,32 @@ fi
 
 # {{{ download and install
 
-MINICONDA_VERSION=3
-MINICONDA_INSTALL_DIR=.miniconda${MINICONDA_VERSION}
+MINIFORGE_VERSION=3
+MINIFORGE_INSTALL_DIR=.miniforge${MINIFORGE_VERSION}
 
-MINICONDA_INSTALL_SH=Miniconda${MINICONDA_VERSION}-latest-${PLATFORM}-x86_64.sh
-curl -O "https://repo.anaconda.com/miniconda/$MINICONDA_INSTALL_SH"
+MINIFORGE_INSTALL_SH=Miniforge3-$PLATFORM-x86_64.sh
+curl -O "https://github.com/conda-forge/miniforge/releases/latest/download/$MINIFORGE_INSTALL_SH"
 
-rm -Rf "$MINICONDA_INSTALL_DIR"
+rm -Rf "$MINIFORGE_INSTALL_DIR"
 
-bash "$MINICONDA_INSTALL_SH" -b -p "$MINICONDA_INSTALL_DIR"
+bash "$MINIFORGE_INSTALL_SH" -b -p "$MINIFORGE_INSTALL_DIR"
 
 # }}}
 
 # {{{ set up testing environment
 
-PATH="$MINICONDA_INSTALL_DIR/bin/:$PATH" conda update conda --yes --quiet
+PATH="$MINIFORGE_INSTALL_DIR/bin/:$PATH" conda update conda --yes --quiet
 
-PATH="$MINICONDA_INSTALL_DIR/bin/:$PATH" conda update --all --yes --quiet
+PATH="$MINIFORGE_INSTALL_DIR/bin/:$PATH" conda update --all --yes --quiet
 
-PATH="$MINICONDA_INSTALL_DIR/bin:$PATH" conda env create --file "$CONDA_ENVIRONMENT" --name testing
+PATH="$MINIFORGE_INSTALL_DIR/bin:$PATH" conda env create --file "$CONDA_ENVIRONMENT" --name testing
 
-source "$MINICONDA_INSTALL_DIR/bin/activate" testing
+source "$MINIFORGE_INSTALL_DIR/bin/activate" testing
 
 # https://github.com/conda-forge/ocl-icd-feedstock/issues/11#issuecomment-456270634
-rm -f .miniconda3/envs/testing/etc/OpenCL/vendors/system-*.icd
+rm -f $MINIFORGE_INSTALL_DIR/envs/testing/etc/OpenCL/vendors/system-*.icd
 # https://gitlab.tiker.net/inducer/pytential/issues/112
-rm -f .miniconda3/envs/testing/etc/OpenCL/vendors/apple.icd
+rm -f $MINIFORGE_INSTALL_DIR/envs/testing/etc/OpenCL/vendors/apple.icd
 
 # https://github.com/pypa/pip/issues/5345#issuecomment-386443351
 export XDG_CACHE_HOME=$HOME/.cache/$CI_RUNNER_ID
-- 
GitLab


From 9fab9b00078e88a25b91eb7b8d20f22484da8193 Mon Sep 17 00:00:00 2001
From: Andreas Kloeckner <inform@tiker.net>
Date: Sat, 23 May 2020 18:03:06 -0500
Subject: [PATCH 2/4] Point build-and-test-py-project-within-miniconda.sh to
 miniforge branch

---
 build-and-test-py-project-within-miniconda.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build-and-test-py-project-within-miniconda.sh b/build-and-test-py-project-within-miniconda.sh
index 6ec75ec..34af683 100644
--- a/build-and-test-py-project-within-miniconda.sh
+++ b/build-and-test-py-project-within-miniconda.sh
@@ -3,7 +3,7 @@
 set -e
 set -x
 
-curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-py-project-within-miniconda.sh
+curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/miniforge/build-py-project-within-miniconda.sh
 source build-py-project-within-miniconda.sh
 
 PY_EXE=python
-- 
GitLab


From c8e3dc379d599f3585ed72f2ac352acf7bd7ac33 Mon Sep 17 00:00:00 2001
From: Andreas Kloeckner <inform@tiker.net>
Date: Sat, 23 May 2020 18:06:56 -0500
Subject: [PATCH 3/4] Follow redirects when downloading miniforge

---
 build-py-project-within-miniconda.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build-py-project-within-miniconda.sh b/build-py-project-within-miniconda.sh
index b9c09b2..25e8ae6 100644
--- a/build-py-project-within-miniconda.sh
+++ b/build-py-project-within-miniconda.sh
@@ -60,7 +60,7 @@ MINIFORGE_VERSION=3
 MINIFORGE_INSTALL_DIR=.miniforge${MINIFORGE_VERSION}
 
 MINIFORGE_INSTALL_SH=Miniforge3-$PLATFORM-x86_64.sh
-curl -O "https://github.com/conda-forge/miniforge/releases/latest/download/$MINIFORGE_INSTALL_SH"
+curl -L -O "https://github.com/conda-forge/miniforge/releases/latest/download/$MINIFORGE_INSTALL_SH"
 
 rm -Rf "$MINIFORGE_INSTALL_DIR"
 
-- 
GitLab


From a594106f574b674dec08135c578bb814bf8598f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20Kl=C3=B6ckner?= <inform@tiker.net>
Date: Sun, 24 May 2020 01:58:12 +0200
Subject: [PATCH 4/4] Point build-and-test-py-project-within-miniconda.sh back
 to master

---
 build-and-test-py-project-within-miniconda.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build-and-test-py-project-within-miniconda.sh b/build-and-test-py-project-within-miniconda.sh
index 34af683..6ec75ec 100644
--- a/build-and-test-py-project-within-miniconda.sh
+++ b/build-and-test-py-project-within-miniconda.sh
@@ -3,7 +3,7 @@
 set -e
 set -x
 
-curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/miniforge/build-py-project-within-miniconda.sh
+curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-py-project-within-miniconda.sh
 source build-py-project-within-miniconda.sh
 
 PY_EXE=python
-- 
GitLab