Skip to content

Commit 3e359c9

Browse files
fix(ci): need system uv to update lock before activating devshell
Signed-off-by: Cameron Smith <cameron.ray.smith@gmail.com>
1 parent 46c6f6a commit 3e359c9

File tree

1 file changed

+15
-10
lines changed

1 file changed

+15
-10
lines changed

.github/workflows/ci.yaml

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -196,19 +196,25 @@ jobs:
196196
uses: mxschmitt/action-tmate@e5c7151931ca95bad1c6f4190c730ecf8c7dde48 # ratchet:mxschmitt/action-tmate@v3
197197
if: ${{ needs.set-variables.outputs.debug == 'true' }}
198198

199-
- name: Install omnix
200-
run: nix --accept-flake-config profile install "github:juspay/omnix"
199+
# - name: Install omnix
200+
# run: nix --accept-flake-config profile install "github:juspay/omnix"
201+
202+
- name: Install uv
203+
uses: astral-sh/setup-uv@f94ec6bedd8674c4426838e6b50417d36b6ab231 # ratchet:astral-sh/setup-uv@v5
204+
with:
205+
python-version: "3.12"
206+
enable-cache: true
207+
cache-dependency-glob: "uv.lock"
208+
version: "0.6.4"
201209

202210
- name: Test template initialization
211+
# This script executes the tl;dr one-liner from the README
203212
run: |
204-
# Determine the correct repository reference
205213
REPO_REF="github:sciexp/python-nix-template/${{ needs.set-variables.outputs.checkout_rev }}"
206214
echo "Using repository reference: $REPO_REF"
207215
208-
# Clean any existing test directory
209216
rm -fr pnt-new
210217
211-
# Initialize the template
212218
nix --accept-flake-config run github:juspay/omnix -- init "$REPO_REF" -o pnt-new --non-interactive --params '{
213219
"package-name-kebab-case": "pnt-new",
214220
"package-name-snake-case": "pnt_new",
@@ -221,21 +227,20 @@ jobs:
221227
"include-flake-template": false
222228
}'
223229
224-
# Set up the new project
225230
cd pnt-new
226231
git init
227232
git config --local user.email "test@example.com"
228233
git config --local user.name "Test User"
229234
git commit --allow-empty -m "initial commit (empty)"
230235
git add .
231236
232-
# Fix template names and set up environment
237+
# TODO: remove on resolution of https://github.com/juspay/omnix/issues/425
233238
nix run .#fix-template-names -- python-nix-template
239+
# This needs to use the system uv (astral-sh/setup-uv) before entering
240+
# the devshell
241+
uv lock
234242
git add .
235243
236-
# Test that the project tests pass
237-
nix develop -c uv lock
238-
git add .
239244
nix develop -c pytest
240245
241246
test-python:

0 commit comments

Comments
 (0)