From 98745ec2c1a888e9e1371284d0860c7f363b1021 Mon Sep 17 00:00:00 2001 From: Daniel Himmelstein Date: Fri, 20 Dec 2024 09:18:09 -0500 Subject: [PATCH 1/2] replace all mambaforge with miniforge closes https://github.com/manubot/rootstock/issues/519 --- build/README.md | 2 +- ci/install.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/README.md b/build/README.md index 3c09035b..2a07537f 100644 --- a/build/README.md +++ b/build/README.md @@ -32,7 +32,7 @@ To change the options, either edit the YAML files directly or add additional `-- Note: currently, **Windows is not supported**. The Manubot environment is managed with [conda](https://conda.io). -If you do not have `conda` installed, we recommend using the Miniforge3 (includes `conda`) or Mambaforge (includes `conda` and `mamba`) installers from [miniforge](https://github.com/conda-forge/miniforge). +If you do not have `conda` installed, we recommend using the Miniforge3 installer from [miniforge](https://github.com/conda-forge/miniforge) (includes `conda` and `mamba`). Install the environment from [`environment.yml`](environment.yml) by running one of following commands (from the repository's root directory): diff --git a/ci/install.sh b/ci/install.sh index 6b20f0e1..12e516ce 100755 --- a/ci/install.sh +++ b/ci/install.sh @@ -7,7 +7,7 @@ set -o errexit \ -o pipefail -wget https://github.com/conda-forge/miniforge/releases/latest/download/Mambaforge-$(uname)-$(uname -m).sh \ +wget https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-$(uname)-$(uname -m).sh \ --output-document miniforge.sh bash miniforge.sh -b -p $HOME/miniconda source $HOME/miniconda/etc/profile.d/conda.sh From ef82887fffda3b5ea8831b84d94064cdc4a1c7ae Mon Sep 17 00:00:00 2001 From: Daniel Himmelstein Date: Fri, 20 Dec 2024 09:40:54 -0500 Subject: [PATCH 2/2] fix appveyor error From https://ci.appveyor.com/project/manubot/rootstock/builds/51206619#L577 E: Repository 'http://ppa.launchpad.net/rabbitmq/rabbitmq-erlang/ubuntu jammy InRelease' changed its 'Label' value from 'Latest (26.x) Erlang packages for Ubuntu and Debian' to 'Modern Erlang and Elixir packages for Ubuntu' N: This must be accepted explicitly before updates for this repository can be applied. See apt-secure(8) manpage for details. --- ci/install-spellcheck.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ci/install-spellcheck.sh b/ci/install-spellcheck.sh index e12661ec..44431415 100755 --- a/ci/install-spellcheck.sh +++ b/ci/install-spellcheck.sh @@ -6,7 +6,8 @@ set -o errexit \ -o pipefail -sudo apt-get update --yes +# --allow-releaseinfo-change for error on appveyor like "Repository ... changed its 'Label' value" +sudo apt-get update --yes --allow-releaseinfo-change sudo apt-get install --yes aspell aspell-en wget --directory-prefix=build/pandoc/filters \ https://github.com/pandoc/lua-filters/raw/13c3fa7e97206413609a48a82575cb43137e037f/spellcheck/spellcheck.lua