Skip to content

Commit 537fd13

Browse files
committed
chore: simplify CI workaround for pixi
1 parent 9c2414c commit 537fd13

1 file changed

Lines changed: 7 additions & 19 deletions

File tree

.github/workflows/basic.yml

Lines changed: 7 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -169,14 +169,6 @@ jobs:
169169
fetch-depth: 0
170170
repository: DIRACGrid/diracx
171171
path: diracx
172-
# Install the diracx environments from the committed (pristine) lockfile
173-
# FIRST. pixi 0.68 needs an already-installed conda environment to build
174-
# PyPI *source* dependencies during a solve. The next step injects the
175-
# local DIRAC/DIRACCommon clones as source deps, which forces a re-solve
176-
# (locked: false below) -- and with no conda env present that solve panics
177-
# in build_dispatch ("installation of conda environment is required to
178-
# solve PyPI source dependencies but `--no-install` flag has been set").
179-
# Materialising the envs here gives that re-solve a usable interpreter.
180172
- uses: prefix-dev/setup-pixi@v0.9.3
181173
with:
182174
cache: false
@@ -197,19 +189,15 @@ jobs:
197189
# Workaround for https://github.com/prefix-dev/pixi/issues/3762
198190
sed -i.bak 's@editable = true@editable = false@g' pixi.toml
199191
rm pixi.toml.bak
200-
# Inject the local DIRAC/DIRACCommon clones (and the GHA annotations
201-
# plugin) as test-time pypi deps of the shared diracx-core feature.
202-
grep -q '^\[feature\.diracx-core\.pypi-dependencies\]$' pixi.toml \
203-
|| { echo "::error::[feature.diracx-core.pypi-dependencies] not found in pixi.toml"; exit 1; }
204-
sed -i "/^\[feature\.diracx-core\.pypi-dependencies\]\$/a pytest-github-actions-annotate-failures = \"*\"" pixi.toml
205-
sed -i "/^\[feature\.diracx-core\.pypi-dependencies\]\$/a DIRAC = { path = \"${PWD}/../DIRAC\", editable = false }" pixi.toml
206-
sed -i "/^\[feature\.diracx-core\.pypi-dependencies\]\$/a DIRACCommon = { path = \"${PWD}/../DIRAC/dirac-common\", editable = false }" pixi.toml
192+
sed -i.bak '/solve-group = "gubbins"/d' pixi.toml
193+
rm pixi.toml.bak
194+
# Add annotations to github actions
195+
pixi add --pypi --feature diracx-core pytest-github-actions-annotate-failures
196+
# Add the current DIRAC clone to the pixi.toml
197+
pixi add --pypi --feature diracx-core 'DIRACCommon @ file://'$PWD'/../DIRAC/dirac-common'
198+
pixi add --pypi --feature diracx-core 'DIRAC @ file://'$PWD'/../DIRAC'
207199
# Show any changes
208200
git diff
209-
# Re-install with the injected DIRAC/DIRACCommon source deps. The manifest
210-
# no longer matches the committed lockfile, so let pixi regenerate it
211-
# (locked: false); the conda envs installed above let it build the new
212-
# source deps without the build_dispatch panic.
213201
- uses: prefix-dev/setup-pixi@v0.9.3
214202
with:
215203
cache: false

0 commit comments

Comments
 (0)