Merge remote-tracking branch 'upstream/main' into test-interchange-0.…

…4.0beta1
openforcefield · Oct 1, 2024 · 0647c44 · 0647c44
2 parents 6e52d22 + fd7b8b0
commit 0647c44
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 0 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -76,6 +76,7 @@ jobs:
       - name: Install environment with ${{ env.JOBNAME }}
         uses: mamba-org/setup-micromamba@v1
         with:
+          micromamba-version: '1.5.10-0'
           environment-file: devtools/conda-envs/${{ env.ENVFILE }}.yaml
           create-args: >-
             python=${{ matrix.python-version }}

diff --git a/.github/workflows/beta_rc.yaml b/.github/workflows/beta_rc.yaml
@@ -34,11 +34,14 @@ jobs:
       - name: Install environment with ${{ env.JOBNAME }}
         uses: mamba-org/setup-micromamba@v1
         with:
+          micromamba-version: '1.5.10-0'
           environment-file: devtools/conda-envs/test_env.yaml
           condarc: |
             channels:
               - conda-forge/label/openmm_rc
               - conda-forge/label/mdtraj_rc
+              - conda-forge/label/openff-toolkit_rc
+              - conda-forge/label/openff-interchange_rc
               - openeye/label/rc
               - openeye
               - conda-forge

diff --git a/.github/workflows/conda.yml b/.github/workflows/conda.yml
@@ -38,13 +38,15 @@ jobs:
         uses: mamba-org/setup-micromamba@v1
         if: ${{ matrix.openeye == 'false' }}
         with:
+          micromamba-version: '1.5.10-0'
           environment-file: devtools/conda-envs/conda.yaml
           create-args: >-
             python=${{ matrix.python-version }}
       - name: Install from conda with OpenEye
         uses: mamba-org/setup-micromamba@v1
         if: ${{ matrix.openeye == 'true' }}
         with:
+          micromamba-version: '1.5.10-0'
           environment-file: devtools/conda-envs/conda_oe.yaml
           create-args: >-
             python=${{ matrix.python-version }}

diff --git a/.github/workflows/examples.yml b/.github/workflows/examples.yml
@@ -62,6 +62,7 @@ jobs:
       - name: Install conda environment with ${{ env.ENVFILE }}
         uses: mamba-org/setup-micromamba@v1
         with:
+          micromamba-version: '1.5.10-0'
           environment-file: devtools/conda-envs/${{env.ENVFILE}}-examples.yaml
           create-args: >-
             python=${{ matrix.python-version }}

diff --git a/.github/workflows/installer.yml b/.github/workflows/installer.yml
@@ -25,6 +25,7 @@ jobs:
     - name: Install conda environment
       uses: mamba-org/setup-micromamba@v1
       with:
+        micromamba-version: '1.5.10-0'
         environment-file: devtools/conda-envs/installer.yaml
         create-args: >-
           python=${{ matrix.python-version }}