From 7c8a0c55dd7eede1137e5637bea3b5e838c65c35 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Tue, 10 Nov 2020 20:47:40 -0600 Subject: [PATCH 01/18] Windows --- .github/workflows/ci.yml | 14 ++++++++++++++ Miniforge3/construct.yaml | 1 + build_miniforge.bat | 3 +++ scripts/build.sh | 12 +++++++++--- scripts/test.sh | 19 +++++++++++++------ 5 files changed, 40 insertions(+), 9 deletions(-) create mode 100644 build_miniforge.bat mode change 100755 => 100644 scripts/test.sh diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a55ed618..2122576a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,6 +9,11 @@ jobs: fail-fast: false matrix: include: + - os: windows-latest + ARCH: x86_64 + MINIFORGE_NAME: "Miniforge3" + OS_NAME: "Windows" + - os: macos-latest ARCH: arm64 MINIFORGE_NAME: "Miniforge3" @@ -70,6 +75,11 @@ jobs: - name: Checkout code uses: actions/checkout@v2 + - uses: conda-incubator/setup-miniconda@v2 + with: + miniconda-version: "latest" + if: contains(matrix.OS_NAME, "Windows") + - name: Build and test miniforge env: ARCH: ${{ matrix.ARCH }} @@ -87,9 +97,13 @@ jobs: if [[ "$OS_NAME" == "MacOSX" ]]; then bash build_miniforge_osx.sh; fi + if [[ "$OS_NAME" == "Windows" ]]; then + cmd.exe /c build_miniforge.bat + fi # Copy for latest release cp build/$MINIFORGE_NAME-*-$OS_NAME-$ARCH.sh build/$MINIFORGE_NAME-$OS_NAME-$ARCH.sh ls -alh build + shell: bash - name: Upload miniforge to release uses: svenstaro/upload-release-action@v2 diff --git a/Miniforge3/construct.yaml b/Miniforge3/construct.yaml index 57c1420f..9e63133b 100644 --- a/Miniforge3/construct.yaml +++ b/Miniforge3/construct.yaml @@ -11,6 +11,7 @@ channels: # - https://conda.anaconda.org/conda-forge - conda-forge # [not (osx and arm64)] - https://conda-web.anaconda.org/conda-forge # [osx and arm64] + - msys2 # [win] write_condarc: True # keep pkgs for space-saving implications for hardlinks when create new environments diff --git a/build_miniforge.bat b/build_miniforge.bat new file mode 100644 index 00000000..4b16544f --- /dev/null +++ b/build_miniforge.bat @@ -0,0 +1,3 @@ +call conda install posix +bash scripts\build.sh +bash scripts\test.sh diff --git a/scripts/build.sh b/scripts/build.sh index fe3beb73..ceaef2de 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -4,14 +4,19 @@ set -xe echo "***** Start: Building Miniforge installer *****" -CONSTRUCT_ROOT="${CONSTRUCT_ROOT:-/construct}" +CONSTRUCT_ROOT="${CONSTRUCT_ROOT:-$PWD}" cd $CONSTRUCT_ROOT # Constructor should be latest for non-native building # See https://github.com/conda/constructor echo "***** Install constructor *****" -conda install -y "constructor>=3.1.0" jinja2 coreutils +conda install -y "constructor>=3.1.0" jinja2 +if [[ "$(uname)" == "Darwin" ]]; then + conda install -y coreutils +elif [[ "$(uname)" == "MSYS"* ]]; then + conda install -y "nsis=3.01" +fi pip install git+git://github.com/conda/constructor@8c0121d3b81846de42973b52f13135f0ffeaddda#egg=constructor --force --no-deps conda list @@ -37,11 +42,12 @@ constructor $TEMP_DIR/Miniforge3/ --output-dir $TEMP_DIR $EXTRA_CONSTRUCTOR_ARGS echo "***** Generate installer hash *****" cd $TEMP_DIR # This line ill break if there is more than one installer in the folder. -INSTALLER_PATH=$(find . -name "Miniforge*.sh" | head -n 1) +INSTALLER_PATH=$(find . -name "Miniforge*.sh" -or -name "Miniforge*.exe" | head -n 1) HASH_PATH="$INSTALLER_PATH.sha256" sha256sum $INSTALLER_PATH > $HASH_PATH echo "***** Move installer and hash to build folder *****" +mkdir -p $CONSTRUCT_ROOT/build mv $INSTALLER_PATH $CONSTRUCT_ROOT/build/ mv $HASH_PATH $CONSTRUCT_ROOT/build/ diff --git a/scripts/test.sh b/scripts/test.sh old mode 100755 new mode 100644 index a5fa066b..043ceb35 --- a/scripts/test.sh +++ b/scripts/test.sh @@ -6,22 +6,29 @@ echo "***** Start: Testing Miniforge installer *****" export CONDA_PATH="$HOME/miniforge" -CONSTRUCT_ROOT="${CONSTRUCT_ROOT:-/construct}" +CONSTRUCT_ROOT="${CONSTRUCT_ROOT:-$PWD}" cd ${CONSTRUCT_ROOT} echo "***** Get the installer *****" -INSTALLER_PATH=$(find build/ -name "Miniforge*$ARCH.sh" | head -n 1) +INSTALLER_PATH=$(find build/ -name "Miniforge*.sh" -or -name "Miniforge*.exe"| head -n 1) echo "***** Run the installer *****" chmod +x $INSTALLER_PATH -bash $INSTALLER_PATH -b -p $CONDA_PATH +if [[ "$(uname)" == MSYS* ]]; then + echo "start /wait \"\" build/Miniforge3-4.9.0-0-Windows-x86_64.exe /InstallationType=JustMe /RegisterPython=0 /S /D=$(cygpath -w $CONDA_PATH)" > install.bat + cmd.exe /c install.bat + MINIFORGE_CONDA_EXE="conda.exe" +else + bash $INSTALLER_PATH -b -p $CONDA_PATH + MINIFORGE_CONDA_EXE="conda" +fi echo "***** Setup conda *****" -source $CONDA_PATH/bin/activate +source $CONDA_PATH/Scripts/activate echo "***** Print conda info *****" -conda info +$MINIFORGE_CONDA_EXE info # 2020/09/15: Running conda update switches from pypy to cpython. Not sure why # echo "***** Run conda update *****" @@ -38,4 +45,4 @@ python -c "import platform; print(platform.system())" python -c "import platform; print(platform.machine())" python -c "import platform; print(platform.release())" -echo "***** Done: Building Testing installer *****" +echo "***** Done: Testing installer *****" From b75cd9ef0ac721be487cfc02f8a999e1f57acefb Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Tue, 10 Nov 2020 20:50:49 -0600 Subject: [PATCH 02/18] fix qoutes --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2122576a..8685b42c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -78,7 +78,7 @@ jobs: - uses: conda-incubator/setup-miniconda@v2 with: miniconda-version: "latest" - if: contains(matrix.OS_NAME, "Windows") + if: contains(matrix.OS_NAME, 'Windows') - name: Build and test miniforge env: From 41488d7fc6c0717e61c69e1c840ed9b3ecf415b4 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Tue, 10 Nov 2020 20:58:04 -0600 Subject: [PATCH 03/18] fix build --- .github/workflows/ci.yml | 2 +- build_miniforge.bat | 3 --- build_miniforge_win.sh | 3 +++ scripts/test.sh | 19 ++++++++++++------- 4 files changed, 16 insertions(+), 11 deletions(-) delete mode 100644 build_miniforge.bat create mode 100644 build_miniforge_win.sh diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8685b42c..874bb098 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -98,7 +98,7 @@ jobs: bash build_miniforge_osx.sh; fi if [[ "$OS_NAME" == "Windows" ]]; then - cmd.exe /c build_miniforge.bat + bash build_miniforge_win.sh fi # Copy for latest release cp build/$MINIFORGE_NAME-*-$OS_NAME-$ARCH.sh build/$MINIFORGE_NAME-$OS_NAME-$ARCH.sh diff --git a/build_miniforge.bat b/build_miniforge.bat deleted file mode 100644 index 4b16544f..00000000 --- a/build_miniforge.bat +++ /dev/null @@ -1,3 +0,0 @@ -call conda install posix -bash scripts\build.sh -bash scripts\test.sh diff --git a/build_miniforge_win.sh b/build_miniforge_win.sh new file mode 100644 index 00000000..c0da4786 --- /dev/null +++ b/build_miniforge_win.sh @@ -0,0 +1,3 @@ +conda install posix +scripts\build.sh +scripts\test.sh diff --git a/scripts/test.sh b/scripts/test.sh index 043ceb35..e1ca95f5 100644 --- a/scripts/test.sh +++ b/scripts/test.sh @@ -18,17 +18,22 @@ chmod +x $INSTALLER_PATH if [[ "$(uname)" == MSYS* ]]; then echo "start /wait \"\" build/Miniforge3-4.9.0-0-Windows-x86_64.exe /InstallationType=JustMe /RegisterPython=0 /S /D=$(cygpath -w $CONDA_PATH)" > install.bat cmd.exe /c install.bat - MINIFORGE_CONDA_EXE="conda.exe" + + echo "***** Setup conda *****" + source $CONDA_PATH/Scripts/activate + + echo "***** Print conda info *****" + conda.exe info else bash $INSTALLER_PATH -b -p $CONDA_PATH - MINIFORGE_CONDA_EXE="conda" -fi -echo "***** Setup conda *****" -source $CONDA_PATH/Scripts/activate + echo "***** Setup conda *****" + source $CONDA_PATH/bin/activate + + echo "***** Print conda info *****" + conda info +fi -echo "***** Print conda info *****" -$MINIFORGE_CONDA_EXE info # 2020/09/15: Running conda update switches from pypy to cpython. Not sure why # echo "***** Run conda update *****" From 00a54b1fadcdfaec4fa1d4eb2bf880b5c733dd08 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Tue, 10 Nov 2020 21:00:33 -0600 Subject: [PATCH 04/18] activate --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 874bb098..282a0e69 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -98,6 +98,7 @@ jobs: bash build_miniforge_osx.sh; fi if [[ "$OS_NAME" == "Windows" ]]; then + source C:\Miniconda3\Scripts\activate bash build_miniforge_win.sh fi # Copy for latest release From 3118b4f9b05c0694f66d788518632bb2d8316484 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Tue, 10 Nov 2020 21:03:18 -0600 Subject: [PATCH 05/18] unixy path --- .github/workflows/ci.yml | 2 +- build_miniforge_win.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 282a0e69..59cdb6ce 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -98,7 +98,7 @@ jobs: bash build_miniforge_osx.sh; fi if [[ "$OS_NAME" == "Windows" ]]; then - source C:\Miniconda3\Scripts\activate + source /c/Miniconda3/Scripts/activate.sh bash build_miniforge_win.sh fi # Copy for latest release diff --git a/build_miniforge_win.sh b/build_miniforge_win.sh index c0da4786..a821919b 100644 --- a/build_miniforge_win.sh +++ b/build_miniforge_win.sh @@ -1,3 +1,3 @@ -conda install posix +conda install posix --yes scripts\build.sh scripts\test.sh From 26d7966ca68b1e7a01b3abe4e66a2394c5999427 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Tue, 10 Nov 2020 21:05:36 -0600 Subject: [PATCH 06/18] Fix linux builds --- build_miniforge.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/build_miniforge.sh b/build_miniforge.sh index 184f06b8..c071db90 100755 --- a/build_miniforge.sh +++ b/build_miniforge.sh @@ -6,6 +6,7 @@ set -ex ARCH=${ARCH:-aarch64} DOCKER_ARCH=${DOCKER_ARCH:arm64v8} DOCKERIMAGE=${DOCKERIMAGE:-condaforge/linux-anvil-aarch64} +export CONSTRUCT_ROOT=/construct echo "============= Create build directory =============" mkdir -p build/ @@ -15,7 +16,7 @@ echo "============= Enable QEMU =============" docker run --rm --privileged multiarch/qemu-user-static:register --reset --credential yes echo "============= Build the installer =============" -docker run --rm -v $(pwd):/construct -e MINIFORGE_VERSION -e MINIFORGE_NAME $DOCKERIMAGE /construct/scripts/build.sh +docker run --rm -v $(pwd):/construct -e $CONSTRUCT_ROOT -e MINIFORGE_VERSION -e MINIFORGE_NAME $DOCKERIMAGE /construct/scripts/build.sh echo "============= Download QEMU static binaries =============" bash scripts/get_qemu.sh @@ -24,6 +25,6 @@ echo "============= Test the installer =============" for TEST_IMAGE_NAME in "ubuntu:20.04" "ubuntu:19.10" "ubuntu:16.04" "ubuntu:18.04" "centos:7" "debian:buster" do echo "============= Test installer on $TEST_IMAGE_NAME =============" - docker run --rm -v $(pwd):/construct -v $(pwd)/build/qemu/qemu-${ARCH}-static:/usr/bin/qemu-${ARCH}-static ${DOCKER_ARCH}/$TEST_IMAGE_NAME /construct/scripts/test.sh + docker run --rm -v $(pwd):/construct -e $CONSTRUCT_ROOT -v $(pwd)/build/qemu/qemu-${ARCH}-static:/usr/bin/qemu-${ARCH}-static ${DOCKER_ARCH}/$TEST_IMAGE_NAME /construct/scripts/test.sh done From befa6dd2a0a6beb50b8b047b0cf86c68f21ef17e Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Tue, 10 Nov 2020 21:05:52 -0600 Subject: [PATCH 07/18] fix typo --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 59cdb6ce..4219d44a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -98,7 +98,7 @@ jobs: bash build_miniforge_osx.sh; fi if [[ "$OS_NAME" == "Windows" ]]; then - source /c/Miniconda3/Scripts/activate.sh + source /c/Miniconda3/Scripts/activate bash build_miniforge_win.sh fi # Copy for latest release From 29d8f82c18cd69e5c06c0db844487fbe674119b0 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Tue, 10 Nov 2020 21:09:26 -0600 Subject: [PATCH 08/18] fix more typos --- build_miniforge.sh | 4 ++-- build_miniforge_win.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build_miniforge.sh b/build_miniforge.sh index c071db90..d4f8d454 100755 --- a/build_miniforge.sh +++ b/build_miniforge.sh @@ -16,7 +16,7 @@ echo "============= Enable QEMU =============" docker run --rm --privileged multiarch/qemu-user-static:register --reset --credential yes echo "============= Build the installer =============" -docker run --rm -v $(pwd):/construct -e $CONSTRUCT_ROOT -e MINIFORGE_VERSION -e MINIFORGE_NAME $DOCKERIMAGE /construct/scripts/build.sh +docker run --rm -v $(pwd):/construct -e CONSTRUCT_ROOT -e MINIFORGE_VERSION -e MINIFORGE_NAME $DOCKERIMAGE /construct/scripts/build.sh echo "============= Download QEMU static binaries =============" bash scripts/get_qemu.sh @@ -25,6 +25,6 @@ echo "============= Test the installer =============" for TEST_IMAGE_NAME in "ubuntu:20.04" "ubuntu:19.10" "ubuntu:16.04" "ubuntu:18.04" "centos:7" "debian:buster" do echo "============= Test installer on $TEST_IMAGE_NAME =============" - docker run --rm -v $(pwd):/construct -e $CONSTRUCT_ROOT -v $(pwd)/build/qemu/qemu-${ARCH}-static:/usr/bin/qemu-${ARCH}-static ${DOCKER_ARCH}/$TEST_IMAGE_NAME /construct/scripts/test.sh + docker run --rm -v $(pwd):/construct -e CONSTRUCT_ROOT -v $(pwd)/build/qemu/qemu-${ARCH}-static:/usr/bin/qemu-${ARCH}-static ${DOCKER_ARCH}/$TEST_IMAGE_NAME /construct/scripts/test.sh done diff --git a/build_miniforge_win.sh b/build_miniforge_win.sh index a821919b..dbd1368f 100644 --- a/build_miniforge_win.sh +++ b/build_miniforge_win.sh @@ -1,3 +1,3 @@ conda install posix --yes -scripts\build.sh -scripts\test.sh +scripts/build.sh +scripts/test.sh From 3899b9d32be3ce3f27c1e3abe5b7be6323f474af Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Tue, 10 Nov 2020 21:17:15 -0600 Subject: [PATCH 09/18] fix channels --- scripts/build.sh | 6 +++--- scripts/test.sh | 0 2 files changed, 3 insertions(+), 3 deletions(-) mode change 100644 => 100755 scripts/test.sh diff --git a/scripts/build.sh b/scripts/build.sh index ceaef2de..09d04a49 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -11,11 +11,11 @@ cd $CONSTRUCT_ROOT # Constructor should be latest for non-native building # See https://github.com/conda/constructor echo "***** Install constructor *****" -conda install -y "constructor>=3.1.0" jinja2 +conda install -y "constructor>=3.1.0" jinja2 -c conda-forge -c defaults --override-channels if [[ "$(uname)" == "Darwin" ]]; then - conda install -y coreutils + conda install -y coreutils -c conda-forge -c defaults --override-channels elif [[ "$(uname)" == "MSYS"* ]]; then - conda install -y "nsis=3.01" + conda install -y "nsis=3.01" -c conda-forge -c defaults --override-channels fi pip install git+git://github.com/conda/constructor@8c0121d3b81846de42973b52f13135f0ffeaddda#egg=constructor --force --no-deps conda list diff --git a/scripts/test.sh b/scripts/test.sh old mode 100644 new mode 100755 From 0a5f59d5b842c6de361cf3d07cebdb0ba4f799ce Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Tue, 10 Nov 2020 21:23:59 -0600 Subject: [PATCH 10/18] MINGW instead of MSYS --- scripts/build.sh | 2 +- scripts/test.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/build.sh b/scripts/build.sh index 09d04a49..96cd2848 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -14,7 +14,7 @@ echo "***** Install constructor *****" conda install -y "constructor>=3.1.0" jinja2 -c conda-forge -c defaults --override-channels if [[ "$(uname)" == "Darwin" ]]; then conda install -y coreutils -c conda-forge -c defaults --override-channels -elif [[ "$(uname)" == "MSYS"* ]]; then +elif [[ "$(uname)" == MINGW* ]]; then conda install -y "nsis=3.01" -c conda-forge -c defaults --override-channels fi pip install git+git://github.com/conda/constructor@8c0121d3b81846de42973b52f13135f0ffeaddda#egg=constructor --force --no-deps diff --git a/scripts/test.sh b/scripts/test.sh index e1ca95f5..c0c8b780 100755 --- a/scripts/test.sh +++ b/scripts/test.sh @@ -15,7 +15,7 @@ INSTALLER_PATH=$(find build/ -name "Miniforge*.sh" -or -name "Miniforge*.exe"| h echo "***** Run the installer *****" chmod +x $INSTALLER_PATH -if [[ "$(uname)" == MSYS* ]]; then +if [[ "$(uname)" == MINGW* ]]; then echo "start /wait \"\" build/Miniforge3-4.9.0-0-Windows-x86_64.exe /InstallationType=JustMe /RegisterPython=0 /S /D=$(cygpath -w $CONDA_PATH)" > install.bat cmd.exe /c install.bat From d3efa7aebea169cc44f8c055ea9edf9173bc26f1 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Tue, 10 Nov 2020 21:32:26 -0600 Subject: [PATCH 11/18] Fix EXT --- .github/workflows/ci.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4219d44a..2c7dce23 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -93,16 +93,19 @@ jobs: fi if [[ "$OS_NAME" == "Linux" ]]; then bash build_miniforge.sh; + EXT=sh fi if [[ "$OS_NAME" == "MacOSX" ]]; then bash build_miniforge_osx.sh; + EXT=sh fi if [[ "$OS_NAME" == "Windows" ]]; then source /c/Miniconda3/Scripts/activate bash build_miniforge_win.sh + EXT=exe fi # Copy for latest release - cp build/$MINIFORGE_NAME-*-$OS_NAME-$ARCH.sh build/$MINIFORGE_NAME-$OS_NAME-$ARCH.sh + cp build/$MINIFORGE_NAME-*-$OS_NAME-$ARCH.sh build/$MINIFORGE_NAME-$OS_NAME-$ARCH.$EXT ls -alh build shell: bash From de10024d1190249d3219efb92c79c72835d23ecc Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Tue, 10 Nov 2020 21:33:18 -0600 Subject: [PATCH 12/18] fix copy --- scripts/test.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/test.sh b/scripts/test.sh index c0c8b780..ae39ac96 100755 --- a/scripts/test.sh +++ b/scripts/test.sh @@ -24,6 +24,7 @@ if [[ "$(uname)" == MINGW* ]]; then echo "***** Print conda info *****" conda.exe info + conda.exe list else bash $INSTALLER_PATH -b -p $CONDA_PATH @@ -32,6 +33,7 @@ else echo "***** Print conda info *****" conda info + conda list fi From 904a2f4acd0222d52bae17930b5ed2f4379b9818 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Tue, 10 Nov 2020 21:40:35 -0600 Subject: [PATCH 13/18] Fix EXT again --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2c7dce23..bec25125 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -105,7 +105,7 @@ jobs: EXT=exe fi # Copy for latest release - cp build/$MINIFORGE_NAME-*-$OS_NAME-$ARCH.sh build/$MINIFORGE_NAME-$OS_NAME-$ARCH.$EXT + cp build/$MINIFORGE_NAME-*-$OS_NAME-$ARCH.$EXT build/$MINIFORGE_NAME-$OS_NAME-$ARCH.$EXT ls -alh build shell: bash From c3b9ca92f59be81bccff93e9f6a7efdb05a35b17 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Tue, 10 Nov 2020 23:25:41 -0600 Subject: [PATCH 14/18] Check if we are bundling packages from msys2 or defaults --- scripts/test.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/scripts/test.sh b/scripts/test.sh index ae39ac96..6b53b22f 100755 --- a/scripts/test.sh +++ b/scripts/test.sh @@ -21,10 +21,14 @@ if [[ "$(uname)" == MINGW* ]]; then echo "***** Setup conda *****" source $CONDA_PATH/Scripts/activate + conda.exe config --set show_channel_urls true echo "***** Print conda info *****" conda.exe info - conda.exe list + + echo "***** Check if we are bundling packages from msys2 or defaults *****" + conda.exe list | grep defaults && exit 1 + conda.exe list | grep msys2 && exit 1 else bash $INSTALLER_PATH -b -p $CONDA_PATH From 55784ba9fb3dc7495738c0388ea12cea0cc7c4e5 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Tue, 10 Nov 2020 23:32:03 -0600 Subject: [PATCH 15/18] check if we can install r-base --- scripts/test.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/test.sh b/scripts/test.sh index 6b53b22f..8fdc83f0 100755 --- a/scripts/test.sh +++ b/scripts/test.sh @@ -29,6 +29,8 @@ if [[ "$(uname)" == MINGW* ]]; then echo "***** Check if we are bundling packages from msys2 or defaults *****" conda.exe list | grep defaults && exit 1 conda.exe list | grep msys2 && exit 1 + conda.exe list + conda.exe install r-base else bash $INSTALLER_PATH -b -p $CONDA_PATH From 304f821eb418ec36fe59c38e579fcd1e61fdd98f Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Tue, 10 Nov 2020 23:37:51 -0600 Subject: [PATCH 16/18] add comment --- scripts/test.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/test.sh b/scripts/test.sh index 8fdc83f0..c8acca56 100755 --- a/scripts/test.sh +++ b/scripts/test.sh @@ -25,11 +25,13 @@ if [[ "$(uname)" == MINGW* ]]; then echo "***** Print conda info *****" conda.exe info + conda.exe list echo "***** Check if we are bundling packages from msys2 or defaults *****" conda.exe list | grep defaults && exit 1 conda.exe list | grep msys2 && exit 1 - conda.exe list + + echo "***** Check if we can install a package which requires msys2 *****" conda.exe install r-base else bash $INSTALLER_PATH -b -p $CONDA_PATH From 5799923ab0f61395ea434bed35c4a7133ede8e03 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Tue, 10 Nov 2020 23:38:33 -0600 Subject: [PATCH 17/18] quiet install --- scripts/test.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/test.sh b/scripts/test.sh index c8acca56..36b616e4 100755 --- a/scripts/test.sh +++ b/scripts/test.sh @@ -32,7 +32,8 @@ if [[ "$(uname)" == MINGW* ]]; then conda.exe list | grep msys2 && exit 1 echo "***** Check if we can install a package which requires msys2 *****" - conda.exe install r-base + conda.exe install r-base --yes --quiet + conda.exe list else bash $INSTALLER_PATH -b -p $CONDA_PATH From e61b7da8af56180ba2868bf72d42ba91a1a0d2a1 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Tue, 10 Nov 2020 23:52:10 -0600 Subject: [PATCH 18/18] Add instructions --- README.md | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/README.md b/README.md index 9c52071a..fbe4f523 100644 --- a/README.md +++ b/README.md @@ -18,6 +18,7 @@ Latest installers with python 3.8 in the base environment - [linux-x86_64](https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-Linux-x86_64.sh) (also called `amd64`) - [osx-x86_64](https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-MacOSX-x86_64.sh) - [osx-arm64](https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-MacOSX-arm64.sh) (Apple Silicon) +- [win-x86_64](https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-Windows-x86_64.exe) #### Miniforge-pypy3 Latest installers with pypy3.6 in the base environment @@ -29,6 +30,24 @@ Latest installers with pypy3.6 in the base environment Follow the aarch64 and ppc64le migration status here: https://conda-forge.org/status/ +## Install + +To install download the installer and run, + + bash Miniforge3-Linux-x86_64.sh # or similar for other installers for unix platforms + +or if you are on Windows, double click on the installer. + +### Non-interactive install + +For non-interactive usage, look at the options by running the following + + bash Miniforge3-Linux-x86_64.sh -p # or similar for other installers for unix platforms + +or if you are on windows, run: + + start /wait "" build/Miniforge3-4.9.0-0-Windows-x86_64.exe /InstallationType=JustMe /RegisterPython=0 /S /D=%UserProfile%\Miniforge3 + ## Features - [X] Automatic build of constructor.