Skip to content
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.

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

Fix git issue with prerelease job #22

Merged
merged 1 commit into from
Nov 20, 2024
Merged

Fix git issue with prerelease job #22

merged 1 commit into from
Nov 20, 2024

Conversation

mkenigs
Copy link
Collaborator

@mkenigs mkenigs commented Nov 19, 2024

Currently the prerelease job fails with:

error: The following untracked working tree files would be overwritten by checkout:
	nix-installer-aarch64-darwin
	nix-installer-aarch64-linux
	nix-installer-i686-linux
	nix-installer-x86_64-darwin
	nix-installer-x86_64-linux

https://github.com/NixOS/experimental-nix-installer/actions/runs/11708583897/job/32610685871

This is because assemble_installer.py adds those files on main, but then the job tries to checkout prerelease.

Instead, fetch and checkout the prerelease branch in assemble_installer.py before creating those files.

Currently the prerelease job fails with:
```
error: The following untracked working tree files would be overwritten by checkout:
	nix-installer-aarch64-darwin
	nix-installer-aarch64-linux
	nix-installer-i686-linux
	nix-installer-x86_64-darwin
	nix-installer-x86_64-linux
```
https://github.com/NixOS/experimental-nix-installer/actions/runs/11708583897/job/32610685871

This is because assemble_installer.py adds those files on main, but then
the job tries to checkout prerelease.

Instead, fetch and checkout the prerelease branch in
assemble_installer.py before creating those files.
@mkenigs
Copy link
Collaborator Author

mkenigs commented Nov 19, 2024

@mkenigs mkenigs requested a review from abathur November 19, 2024 19:18
@mkenigs mkenigs linked an issue Nov 19, 2024 that may be closed by this pull request
@abathur abathur merged commit 7097f71 into main Nov 20, 2024
13 checks passed
@mkenigs mkenigs deleted the fix-release branch November 20, 2024 14:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

prerelease workflow broken
2 participants