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

Try to integrate a CI #1

Merged
merged 9 commits into from
Jun 13, 2024
Merged

Try to integrate a CI #1

merged 9 commits into from
Jun 13, 2024

Conversation

dinosaure
Copy link
Contributor

No description provided.

Copy link
Contributor

@palainp palainp left a comment

Choose a reason for hiding this comment

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

I think we can converge to similar and maybe more general CI scripts with qubes-mirage-firewall :D Thank you!


- run: ./build-with.sh docker

- run: sh -exc 'if [ $(sha256sum dist/qubes-firewall.xen | cut -d " " -f 1) = $(grep "SHA2 last known" build-with.sh | rev | cut -d ":" -f 1 | rev | cut -d "\"" -f 1 | tr -d " ") ]; then echo "SHA256 MATCHES"; else exit 42; fi'
Copy link
Contributor

Choose a reason for hiding this comment

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

I'm unhappy with those shell commands to compare the result hashsum with qubes-mirage-firewall. It's too sensitive to the string format. Maybe it can be better to have a dedicated file containing the result of the sha256sum command in the repository?
This will also avoid to change the name of the .xen file.

Copy link
Contributor

Choose a reason for hiding this comment

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

fixed in #2

build-with.sh Outdated
echo Building MirageVPN...
$builder run --rm -i -v `pwd`:/tmp/orb-build:Z qubes-miragevpn
echo "SHA2 of build: $(sha256sum ./dist/qubes-firewall.xen)"
echo "SHA2 last known: 0cbb202c1b93e10ad115c9e988f9384005656c0855ec9deaf05a5e9ac9972984"
Copy link
Contributor

Choose a reason for hiding this comment

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

With a dedicated file, this will need to be changed for a cat command :)

Copy link
Contributor

Choose a reason for hiding this comment

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

fixed in #2

@dinosaure dinosaure closed this Jun 13, 2024
@palainp
Copy link
Contributor

palainp commented Jun 13, 2024

Sorry for the misunderstanding PR, #2 was an update to #1, so, to me, #1 should also be merged :)

@hannesm hannesm reopened this Jun 13, 2024
@hannesm
Copy link
Contributor

hannesm commented Jun 13, 2024

I re-opened this PR, and indeed it now contains the code from #2, but nothing is in the main branch...

@dinosaure dinosaure merged commit 283750d into main Jun 13, 2024
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

3 participants