Skip to content

Commit fd12894

Browse files
committed
Merge branch 'pin-awscli-take-2'
2 parents f564432 + 638620d commit fd12894

File tree

3 files changed

+19
-1
lines changed

3 files changed

+19
-1
lines changed

.github/workflows/ci.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ jobs:
5252
run: |
5353
curl -fsSL --proto 'https=' https://micro.mamba.pm/install.sh | bash
5454
echo ~/.local/bin >> "$GITHUB_PATH"
55+
- run: micromamba --version
5556

5657
- uses: actions/checkout@v4
5758

devel/build

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,23 @@ main() {
1515
CONDA_SUBDIR="${CONDA_SUBDIR:-$(./devel/conda-subdir)}"
1616
export CONDA_SUBDIR
1717

18+
# Set CONDA_OVERRIDE_ARCHSPEC if it's unset or empty.
19+
if [[ -z "${CONDA_OVERRIDE_ARCHSPEC:-}" ]]; then
20+
# Unset CONDA_OVERRIDE_ARCHSPEC if it's set but empty. An empty
21+
# archspec override *omits* the virtual __archspec package from
22+
# solving, and we don't want to do that.
23+
unset CONDA_OVERRIDE_ARCHSPEC
24+
25+
case "$CONDA_SUBDIR" in
26+
linux-64|osx-64)
27+
# Avoid x86_64-microarch-level versions >1 for greatest
28+
# compatibility
29+
export CONDA_OVERRIDE_ARCHSPEC=x86_64;;
30+
31+
# Other subdirs use their default.
32+
esac
33+
fi
34+
1835
clean
1936
build src
2037
lock

src/recipe.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ requirements:
6060
# systems with an older bash. This is similar to how our Docker runtime
6161
# image includes its own bash too.
6262
#
63-
- awscli
63+
- awscli >=2
6464
- bash
6565
- bzip2
6666
- csvtk

0 commit comments

Comments
 (0)