Skip to content

Commit 2e2e2fb

Browse files
authored
Fix issues with CI tests from upstream changes (#1229)
1 parent 463756b commit 2e2e2fb

4 files changed

Lines changed: 24 additions & 2 deletions

File tree

.github/workflows/main.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,8 @@ jobs:
111111
- name: Set up conda executable
112112
run: |
113113
if [[ "${{ matrix.conda-standalone }}" == "micromamba" ]]; then
114-
conda create -yqp "${{ runner.temp }}/micromamba" -c conda-forge micromamba
114+
# Pin to <2.6 due to cache regression: https://github.com/mamba-org/mamba/issues/4250
115+
conda create -yqp "${{ runner.temp }}/micromamba" -c conda-forge "micromamba<2.6"
115116
if [[ "${{ runner.os }}" == "Windows" ]]; then
116117
echo "CONSTRUCTOR_CONDA_EXE=${{ runner.temp }}/micromamba/Library/bin/micromamba.exe" >> $GITHUB_ENV
117118
else

constructor/winexe.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ def setup_envs_commands(info, dir_path):
9696
"no_rcs_arg": info.get("_ignore_condarcs_arg", ""),
9797
}
9898
)
99-
# now we generate one item per extra env, if present
99+
# Now we generate one item per extra env, if present
100100
for env_name in info.get("_extra_envs_info", {}):
101101
env_info = info["extra_envs"][env_name]
102102
# Needed for shortcuts_flags function

dev/environment.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ channels:
33
- conda-forge
44
dependencies:
55
- python
6+
- pip
67
- conda >=4.6
78
- ruamel.yaml >=0.11.14,<0.19
89
- conda-standalone # >=23.11.0

news/1229-fix-ci-upstream

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
### Enhancements
2+
3+
* <news item>
4+
5+
### Bug fixes
6+
7+
* <news item>
8+
9+
### Deprecations
10+
11+
* <news item>
12+
13+
### Docs
14+
15+
* <news item>
16+
17+
### Other
18+
19+
* CI: Add `pip` to dev environment (required after `conda-libmamba-solver` 26.4.0 enabled sharded repodata by default). (#1229)
20+
* CI: Pin `micromamba<2.6` due to cache regression ([mamba-org/mamba#4250](https://github.com/mamba-org/mamba/issues/4250)). (#1229)

0 commit comments

Comments
 (0)