Skip to content

Lock conflicts keep one side; environment changes beside main; current pixi in CI #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Marius1311 merged 1 commit into from
Oct 14, 2026
Merged

Lock conflicts keep one side; environment changes beside main; current pixi in CI #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ jobs:
- name: Put it under git, as the README's create steps do
working-directory: ${{ runner.temp }}/my-analysis
run: git init -q -b main && git add -A
- uses: prefix-dev/setup-pixi@v0.8.0
- uses: prefix-dev/setup-pixi@v0.11.1
with:
pixi-version: v0.60.0
pixi-version: latest
manifest-path: ${{ runner.temp }}/my-analysis/pixi.toml
cache: false
- name: Run tests
Expand Down
1 change: 1 addition & 0 deletions {{cookiecutter.project_name}}/.claude/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"analysis-workflow@quadbio": true
},
"permissions": {
"additionalDirectories": ["../{{ cookiecutter.project_name }}-lock"],

@chatgpt-codex-connector chatgpt-codex-connector Bot Oct 14, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Resolve the lock checkout from the main checkout

When a session follows the README's claude --worktree flow, Claude stores the worktree under <project-root>/.claude/worktrees/<task> (worktree documentation), and relative permission paths anchor at the session's primary working directory (settings documentation). Consequently, this entry resolves to <project-root>/.claude/worktrees/{{ cookiecutter.project_name }}-lock, not the <parent>/{{ cookiecutter.project_name }}-lock checkout described by the workflow. Environment-changing tasks run from worktrees therefore do not receive access to the actual lock checkout and will still prompt or fail in non-interactive permission modes; derive the path from the main checkout or place the lock checkout at the configured location.

Useful? React with 👍 / 👎.

@Marius1311 Marius1311 Oct 14, 2026

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not changing this: tested. In an interactive claude --worktree <task> session started from the main checkout, /permissions → Workspace listed the entry resolved beside the main checkout (<parent>/<project>-lock), not under .claude/worktrees/, and copying the lock from there ran without a prompt. A headless claude -p run in a fresh worktree does prompt, but that is workspace trust (project additionalDirectories apply only once the folder is trusted), not path resolution.

"deny": [
"Bash(git add -A:*)",
"Bash(git add --all:*)",
Expand Down
1 change: 1 addition & 0 deletions {{cookiecutter.project_name}}/.gitattributes
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
pixi.lock merge=binary linguist-language=YAML linguist-generated=true
4 changes: 2 additions & 2 deletions {{cookiecutter.project_name}}/.github/workflows/lint.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ jobs:
with:
filter: blob:none
fetch-depth: 0
- uses: prefix-dev/setup-pixi@v0.8.0
- uses: prefix-dev/setup-pixi@v0.11.1
with:
pixi-version: v0.60.0
pixi-version: latest
cache: true
frozen: true
- name: Run pre-commit checks
Expand Down
4 changes: 2 additions & 2 deletions {{cookiecutter.project_name}}/.github/workflows/test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ jobs:
with:
filter: blob:none
fetch-depth: 0
- uses: prefix-dev/setup-pixi@v0.8.0
- uses: prefix-dev/setup-pixi@v0.11.1
with:
pixi-version: v0.60.0
pixi-version: latest
cache: true
frozen: true
- name: Run tests
Expand Down
Loading