Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove miniforge name customization #711

Merged
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 5 additions & 12 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ on: [ push, pull_request ]

jobs:
build:
name: ${{ matrix.MINIFORGE_NAME }}-${{ matrix.OS_NAME }}-${{ matrix.ARCH }}
name: Miniforge3-${{ matrix.OS_NAME }}-${{ matrix.ARCH }}
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
@@ -12,27 +12,23 @@ jobs:
- os: windows-latest
ARCH: x86_64
TARGET_PLATFORM: win-64
MINIFORGE_NAME: "Miniforge3"
OS_NAME: "Windows"

- os: macos-latest
ARCH: arm64
TARGET_PLATFORM: osx-arm64
MINIFORGE_NAME: "Miniforge3"
OS_NAME: "MacOSX"

- os: macos-latest
ARCH: x86_64
TARGET_PLATFORM: osx-64
MINIFORGE_NAME: "Miniforge3"
OS_NAME: "MacOSX"

- os: ubuntu-latest
ARCH: aarch64
TARGET_PLATFORM: linux-aarch64
DOCKER_ARCH: arm64/v8
DOCKERIMAGE: condaforge/linux-anvil-aarch64
MINIFORGE_NAME: "Miniforge3"
OS_NAME: "Linux"
# Reduce the test matrix because the builds timeouts on emulated architectures
# The time consuming operation is an attempt a full solve of conda/mamba/boa
@@ -45,15 +41,13 @@ jobs:
TARGET_PLATFORM: linux-64
DOCKER_ARCH: amd64
DOCKERIMAGE: condaforge/linux-anvil-cos7-x86_64
MINIFORGE_NAME: "Miniforge3"
OS_NAME: "Linux"

- os: ubuntu-latest
ARCH: ppc64le
TARGET_PLATFORM: linux-ppc64le
DOCKER_ARCH: ppc64le
DOCKERIMAGE: condaforge/linux-anvil-ppc64le
MINIFORGE_NAME: "Miniforge3"
OS_NAME: "Linux"
# Reduce the test matrix because the builds timeouts on emulated architectures
# The time consuming operation is an attempt a full solve of conda/mamba/boa
@@ -74,7 +68,6 @@ jobs:
- name: Build and test miniforge
env:
ARCH: ${{ matrix.ARCH }}
MINIFORGE_NAME: ${{ matrix.MINIFORGE_NAME }}
OS_NAME: ${{ matrix.OS_NAME }}
DOCKERIMAGE: ${{ matrix.DOCKERIMAGE }}
DOCKER_ARCH: ${{ matrix.DOCKER_ARCH }}
@@ -99,9 +92,9 @@ jobs:
source build_miniforge_win.sh;
fi
# Copy for latest release
cp build/$MINIFORGE_NAME-*-$OS_NAME-$ARCH.$EXT build/$MINIFORGE_NAME-$OS_NAME-$ARCH.$EXT
cp build/Miniforge3-*-$OS_NAME-$ARCH.$EXT build/Miniforge3-$OS_NAME-$ARCH.$EXT
if [[ "$OS_NAME" == "MacOSX" ]]; then
cp build/$MINIFORGE_NAME-*-$OS_NAME-$ARCH.$EXT build/$MINIFORGE_NAME-Darwin-$ARCH.$EXT
cp build/Miniforge3-*-$OS_NAME-$ARCH.$EXT build/Miniforge3-Darwin-$ARCH.$EXT
fi
ls -alh build
shell: bash
@@ -110,8 +103,8 @@ jobs:
if: always()
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
with:
path: build/${{ matrix.MINIFORGE_NAME }}-${{ matrix.OS_NAME }}-${{ matrix.ARCH }}*
name: ${{ matrix.MINIFORGE_NAME }}-${{ matrix.OS_NAME }}-${{ matrix.ARCH }}
path: build/Miniforge3-${{ matrix.OS_NAME }}-${{ matrix.ARCH }}*
name: Miniforge3-${{ matrix.OS_NAME }}-${{ matrix.ARCH }}

- name: Upload miniforge to release
uses: svenstaro/upload-release-action@04733e069f2d7f7f0b4aebc4fbdbce8613b03ccd # v2.9.0
3 changes: 1 addition & 2 deletions Miniforge3/construct.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
{% set name = os.environ.get("MINIFORGE_NAME", "Miniforge3") %}
{% set version = os.environ.get("MINIFORGE_VERSION", "24.11.2-1") %}
{% set conda_libmamba_solver_version = "24.9.0"%}
# when mamba_version is updated here, also update MICROMAMBA_VERSION in scripts/build.sh
# As of Dec 2024 -- mamba 2.0.5 isn't compatible with constructor
# https://github.com/conda-forge/miniforge/issues/697
{% set mamba_version = "1.5.12" %}

name: {{ name }}
name: Miniforge3
version: {{ version }}
company: conda-forge

3 changes: 1 addition & 2 deletions build_miniforge.sh
Original file line number Diff line number Diff line change
@@ -14,7 +14,6 @@ ARCH=${ARCH:-aarch64}
export TARGET_PLATFORM=${TARGET_PLATFORM:-linux-aarch64}
DOCKER_ARCH=${DOCKER_ARCH:-arm64/v8}
DOCKERIMAGE=${DOCKERIMAGE:-condaforge/linux-anvil-aarch64}
export MINIFORGE_NAME=${MINIFORGE_NAME:-Miniforge3}
OS_NAME=${OS_NAME:-Linux}
EXT=${EXT:-sh}
TEST_IMAGE_NAMES=${TEST_IMAGE_NAMES:-ubuntu:24.04 ubuntu:22.04 ubuntu:20.04 ubuntu:18.04 ubuntu:16.04 centos:7 debian:bookworm debian:bullseye}
@@ -30,7 +29,7 @@ docker run --privileged --rm tonistiigi/binfmt --install all

echo "============= Build the installer ============="
docker run --rm -v "$(pwd):/construct" \
-e CONSTRUCT_ROOT -e MINIFORGE_VERSION -e MINIFORGE_NAME -e TARGET_PLATFORM -e MINIFORGE_LICENSE_OVERRIDE \
-e CONSTRUCT_ROOT -e MINIFORGE_VERSION -e TARGET_PLATFORM -e MINIFORGE_LICENSE_OVERRIDE \
"${DOCKERIMAGE}" /construct/scripts/build.sh

echo "============= Test the installer ============="
4 changes: 2 additions & 2 deletions scripts/build.sh
Original file line number Diff line number Diff line change
@@ -91,6 +91,6 @@ echo "***** Done: Building Miniforge installer *****"
cd "${CONSTRUCT_ROOT}"

# copy the installer for latest
if [[ "${MINIFORGE_NAME:-}" != "" && "${OS_NAME:-}" != "" && "${ARCH:-}" != "" ]]; then
cp "${CONSTRUCT_ROOT}/build/${MINIFORGE_NAME}-"*"-${OS_NAME}-${ARCH}.${EXT}" "${CONSTRUCT_ROOT}/build/${MINIFORGE_NAME}-${OS_NAME}-${ARCH}.${EXT}"
if [[ "${OS_NAME:-}" != "" && "${ARCH:-}" != "" ]]; then
cp "${CONSTRUCT_ROOT}/build/Miniforge3-"*"-${OS_NAME}-${ARCH}.${EXT}" "${CONSTRUCT_ROOT}/build/Miniforge3-${OS_NAME}-${ARCH}.${EXT}"
fi