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

Update the salt script + releases files #205

Merged
merged 4 commits into from
Oct 18, 2024

Conversation

palainp
Copy link
Member

@palainp palainp commented Oct 17, 2024

This PR wants to solve #200 and emphasises the separation of sha256 for released versions and for the current version of head. This way we can push commits on top of head, continue to ensure reproducible builds, and also keep something to compare the shasum of the released version. The PR process will need updating qubes-firewall.sha256, and the release process need to copy this file into qubes-firewall-release.sha256. WDYT?

I'm unsure whether the salt script has been updated correctly and I'll have to wait for the next version to fix any issues.

@hannesm
Copy link
Member

hannesm commented Oct 17, 2024

I think the approach is fine.

@palainp
Copy link
Member Author

palainp commented Oct 17, 2024

I still have an issue the first time I run the script, because the directory for the kernel is not yet created. So far I'm unsure if I have a bad usage of salt or if just need to create the directory if test -e fails on the release version check EDIT: fixed, we now create the directory and always touch the version file:

$ sudo qubesctl --show-output state.apply SaltScript...
[ERROR   ] Command 'test' failed with return code: 1
[ERROR   ] stdout: touch: cannot touch '/var/lib/qubes/vm-kernels/mirage-firewall/version.txt': No such file or directory
cat: /var/lib/qubes/vm-kernels/mirage-firewall/version.txt: No such file or directory
[ERROR   ] retcode: 1
[ERROR   ] Command 'test' failed with return code: 1
[ERROR   ] output: touch: cannot touch '/var/lib/qubes/vm-kernels/mirage-firewall/version.txt': No such file or directory
cat: /var/lib/qubes/vm-kernels/mirage-firewall/version.txt: No such file or directory

@palainp palainp mentioned this pull request Oct 17, 2024
@palainp palainp changed the title WIP: update the salt script + releases files Update the salt script + releases files Oct 17, 2024
@palainp palainp merged commit 9fe2701 into mirage:main Oct 18, 2024
2 checks passed
@palainp palainp deleted the update-saltscript branch October 18, 2024 12:07
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.

2 participants