Merge branch 'main' into dependabot/npm_and_yarn/main/actions/tool-cache-2.0.2

jezdez · web-flow · commit cfc4e0a3a8b3 · 2025-01-20T18:46:36.000+01:00
diff --git a/.github/workflows/example-10.yml b/.github/workflows/example-10.yml
@@ -73,76 +73,3 @@ jobs:
           conda list
           python -VV
           printenv | sort
-
-  example-10-mambaforge:
-    # NOTE: Mambaforge is now equivalent to Miniforge.
-    # We are only testing this to make sure there's a smooth transition.
-    # It should be removed once the product is definitely sunset.
-    # prevent cronjobs from running on forks
-    if:
-      (github.event_name == 'schedule' && github.repository ==
-      'conda-incubator/setup-miniconda') || (github.event_name != 'schedule')
-    name: Ex10 (${{ matrix.os }}, Mambaforge)
-    runs-on: ${{ matrix.os }}-latest
-    defaults:
-      run:
-        shell: bash -el {0}
-    strategy:
-      fail-fast: false
-      matrix:
-        os: ["ubuntu", "macos", "windows"]
-        include:
-          # should use mamba 0.7.4 to upgrade to mamba 0.7.6
-          - os: ubuntu
-            environment-file: etc/example-environment-no-name.yml
-            miniforge-variant: Mambaforge
-            miniforge-version: 4.9.2-2
-            mamba-version: 0.7.6
-            python-version: 3.6
-          # should use mamba >= 0.20
-          - os: ubuntu
-            environment-file: etc/example-environment-no-name.yml
-            miniforge-variant: Mambaforge
-            mamba-version: ">=0.20"
-          # should use mamabforge `latest`
-          - os: windows
-            environment-file: etc/example-explicit.Windows.conda.lock
-            condarc-file: etc/example-condarc.yml
-            miniforge-variant: Mambaforge
-          - os: macos
-            miniforge-variant: Mambaforge
-            miniforge-version: "23.3.1-1"
-    timeout-minutes: 30
-    steps:
-      - uses: actions/checkout@v4
-      - uses: ./
-        id: setup-miniconda
-        with:
-          condarc-file: ${{ matrix.condarc-file }}
-          environment-file: ${{ matrix.environment-file }}
-          miniforge-variant: ${{ matrix.miniforge-variant }}
-          miniforge-version: ${{ matrix.miniforge-version }}
-          mamba-version: ${{ matrix.mamba-version }}
-          use-mamba: true
-          python-version: ${{ matrix.python-version }}
-          clean-patched-environment-file: false
-
-      - run: |
-          mamba info
-          mamba list
-          python -VV
-          printenv | sort
-      - name: verify unpatched environment.yml is reported and not cleaned
-        if: contains(matrix.environment-file, '.yml') && !matrix.python-version
-        run: |
-          set -eux
-          ls '${{ steps.setup-miniconda.outputs.environment-file }}'
-          ls '${{ matrix.environment-file }}'
-          diff -s '${{ steps.setup-miniconda.outputs.environment-file }}' '${{ matrix.environment-file }}' | grep 'are identical'
-      - name: verify patched output is reported, correct, and not cleaned
-        if: contains(matrix.environment-file, '.yml') && matrix.python-version
-        run: |
-          set -eux
-          if [ "$(diff '${{ steps.setup-miniconda.outputs.environment-file }}' '${{ matrix.environment-file }}' | grep -c 'python=${{ matrix.python-version }}')" -ge 1 ] ; then echo ok ; else exit 1 ; fi
-          python --version | grep "Python ${{ matrix.python-version }}"
-          awk '/- conda-forge/,/- defaults/' '${{ steps.setup-miniconda.outputs.environment-file }}'
diff --git a/.github/workflows/example-13.yml b/.github/workflows/example-13.yml
@@ -50,7 +50,7 @@ jobs:
           miniconda-version: latest
       - uses: ./
         if: matrix.variant == 'no-variant'
-        id: setup-miniconda-no-variant
+        id: setup-miniforge-no-variant
         continue-on-error: true
         with:
           miniforge-version: latest
diff --git a/.github/workflows/example-15.yml b/.github/workflows/example-15.yml
@@ -0,0 +1,78 @@
+name: "Example 15: Linux ARM"
+
+on:
+  pull_request:
+    branches:
+      - "*"
+  push:
+    branches:
+      - "develop"
+      - "main"
+      - "master"
+  schedule:
+    # Note that cronjobs run on master/main by default
+    - cron: "0 0 * * *"
+
+jobs:
+  example-15:
+    # prevent cronjobs from running on forks
+    if:
+      (github.event_name == 'schedule' && github.repository ==
+      'conda-incubator/setup-miniconda') || (github.event_name != 'schedule')
+    name: Ex15 (os=${{ matrix.os }} variant=${{ matrix.variant }})
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: ["ubuntu-24.04-arm"]
+        variant: ["Miniforge3", "Miniconda", "no-variant", "empty-with"]
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ./
+        if: matrix.variant == 'Miniforge3'
+        id: setup-miniforge
+        continue-on-error: true
+        with:
+          auto-update-conda: true
+          miniforge-variant: ${{ matrix.variant }}
+          miniforge-version: latest
+      - uses: ./
+        if: matrix.variant == 'Miniconda'
+        id: setup-miniconda
+        continue-on-error: true
+        with:
+          auto-update-conda: true
+          miniconda-version: latest
+      - uses: ./
+        if: matrix.variant == 'no-variant'
+        id: setup-miniforge-no-variant
+        continue-on-error: true
+        with:
+          miniforge-version: latest
+      - uses: ./
+        if: matrix.variant == 'empty-with'
+        id: setup-miniconda-empty-with
+        continue-on-error: true
+      - name: Conda info
+        shell: bash -el {0}
+        run: conda info
+      - name: Conda list
+        shell: bash -el {0}
+        run: conda list
+      - name: Environment
+        shell: bash -el {0}
+        run: printenv | sort
+      - name: Create an environment
+        shell: bash -el {0}
+        run: conda create -n unused --dry-run zlib
+      - name: Run mamba
+        if: matrix.variant == 'Miniforge3'
+        shell: bash -el {0}
+        run: mamba --version
+      - name: Install Python
+        shell: bash -el {0}
+        run: conda install -y python
+      - name: Check architecture
+        shell: bash -el {0}
+        run: |
+          python -c "import platform; assert platform.machine() == 'aarch64', platform.machine()"
diff --git a/.github/workflows/example-6.yml b/.github/workflows/example-6.yml
@@ -32,7 +32,7 @@ jobs:
       fail-fast: false
       matrix:
         os: ["ubuntu-latest", "macos-latest", "windows-latest"]
-        mamba-version: ["1.5.10", "2"]
+        mamba-version: ["1.5.*", "2"]
         include:
           - os: ubuntu-latest
             activate-environment: anaconda-client-env
@@ -49,13 +49,7 @@ jobs:
       - uses: ./
         with:
           miniforge-variant: Miniforge3
-          # Use an old Miniforge (without conda-libmamba-solver) to allow updates to mamba v2.
-          # Set the solver to classic for those too. This can be removed when
-          # conda-libmamba-solver is released with libmamba v2 compatibility.
-          miniforge-version:
-            ${{ matrix.mamba-version == '2' && '23.1.0-0' || 'latest' }}
-          conda-solver:
-            ${{ matrix.mamba-version == '2' && 'classic' || 'libmamba' }}
+          miniforge-version: latest
           python-version: "3.11"
           mamba-version: ${{ matrix.mamba-version }}
           channels: conda-forge,nodefaults
diff --git a/README.md b/README.md
@@ -59,7 +59,8 @@ possibility of automatically activating the `test` environment on all shells.
 | [Caching packages](#caching-packages)                              | [![Caching Example Status][caching-badge]][caching]             |
 | [Caching environments](#caching-environments)                      | [![Caching Env Example Status][caching-env-badge]][caching-env] |
 | [Apple Silicon](#example-13-apple-silicon)                         | [![Apple Silicon][ex13-badge]][ex13]                            |
-| [Remove defaults](#example-14-conda-remove-defaults)               | [![Remove defaults][ex14-badge]][ex14]                          |
+| [Remove defaults](#example-14-remove-defaults-channel)             | [![Remove defaults][ex14-badge]][ex14]                          |
+| [Linux ARM](#example-15-linux-arm)                                 | [![Linux ARM][ex15-badge]][ex15]                                |
 
 [ex1]:
   https://github.com/conda-incubator/setup-miniconda/actions/workflows/example-1.yml
@@ -117,6 +118,10 @@ possibility of automatically activating the `test` environment on all shells.
   https://github.com/conda-incubator/setup-miniconda/actions/workflows/example-14.yml
 [ex14-badge]:
   https://github.com/conda-incubator/setup-miniconda/actions/workflows/example-14.yml/badge.svg?branch=main
+[ex15]:
+  https://github.com/conda-incubator/setup-miniconda/actions/workflows/example-15.yml
+[ex15-badge]:
+  https://github.com/conda-incubator/setup-miniconda/actions/workflows/example-15.yml/badge.svg?branch=main
 
 ## Other Workflows
 
@@ -450,10 +455,10 @@ jobs:
 
 ### Example 7: Lockfiles
 
-`conda list --explicit` and [conda-lock][] support generating [explicit
-environment specifications][explicit-spec], which skip the environment solution
-step altogether, as they contain the _ordered_ list of exact URLs needed to
-reproduce the environment.
+`conda list --explicit` and [conda-lock][conda-lock] support generating
+[explicit environment specifications][explicit-spec], which skip the environment
+solution step altogether, as they contain the _ordered_ list of exact URLs
+needed to reproduce the environment.
 
 This means explicitly-defined environments which:
 
@@ -595,10 +600,10 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: ./
-        id: setup-miniconda
+        id: setup-miniforge
         continue-on-error: true
         with:
-          miniconda-version: latest
+          miniforge-version: latest
       - name: Check arm64
         shell: bash -el {0}
         run: |
@@ -635,6 +640,31 @@ jobs:
           conda config --show-sources
 ```
 
+### Example 15: Linux ARM
+
+```yaml
+jobs:
+  example-15:
+    name: Ex15 (os=${{ matrix.os }})
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: ["ubuntu-24.04-arm"]
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ./
+        id: setup-miniconda
+        continue-on-error: true
+        with:
+          miniforge-version: latest
+      - name: Check ARM
+        shell: bash -el {0}
+        run: |
+          conda install -y python
+          python -c "import platform; assert platform.machine() == 'aarch64', platform.machine()"
+```
+
 ## Caching
 
 ### Caching packages
diff --git a/dist/delete/index.js b/dist/delete/index.js
diff --git a/dist/setup/index.js b/dist/setup/index.js
diff --git a/src/constants.ts b/src/constants.ts
@@ -31,9 +31,9 @@ export const MINICONDA_ARCHITECTURES: types.IArchitectures = {
 export const MINIFORGE_ARCHITECTURES: types.IArchitectures = {
   x64: "x86_64",
   x86_64: "x86_64",
-  aarch64: "aarch64", // To be supported by github runners
+  aarch64: "aarch64",
   ppc64le: "ppc64le", // To be supported by github runners
-  arm64: "arm64", // To be supported by github runners
+  arm64: "arm64",
 };
 
 export const OS_NAMES: types.IOperatingSystems = {
diff --git a/src/input.ts b/src/input.ts
@@ -79,9 +79,14 @@ const RULES: IRule[] = [
  * Parse, validate, and normalize string-ish inputs from a workflow action's `with`
  */
 export async function parseInputs(): Promise<types.IActionInputs> {
+  let arch = core.getInput("architecture") || process.arch;
+  if (arch === "arm64" && constants.IS_LINUX) {
+    // https://github.com/conda-incubator/setup-miniconda/issues/385
+    arch = "aarch64";
+  }
   const inputs: types.IActionInputs = Object.freeze({
     activateEnvironment: core.getInput("activate-environment"),
-    architecture: core.getInput("architecture") || process.arch,
+    architecture: arch,
     condaBuildVersion: core.getInput("conda-build-version"),
     condaConfigFile: core.getInput("condarc-file"),
     condaVersion: core.getInput("conda-version"),
diff --git a/src/installer/download-miniconda.ts b/src/installer/download-miniconda.ts
@@ -52,10 +52,6 @@ export async function downloadMiniconda(
   if (!arch) {
     throw new Error(`Invalid arch "${inputs.architecture}"!`);
   }
-  // Backwards compatibility: ARM64 used to map to aarch64
-  if (arch === "arm64" && constants.IS_LINUX) {
-    arch = constants.MINICONDA_ARCHITECTURES["aarch64"];
-  }
 
   let extension: string = constants.IS_UNIX ? "sh" : "exe";
   let osName: string = constants.OS_NAMES[process.platform];
