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

Tell workstation-ci which Qubes version to use for tests #949

Merged
merged 1 commit into from
Feb 20, 2024

Conversation

legoktm
Copy link
Member

@legoktm legoktm commented Feb 14, 2024

Status

Ready for review

Description of Changes

As we move towards 4.2, we'll still have a 4.1 branch for backports, so the CI runner needs to know which Qubes version to test against. Having this file will tell it what to do and avoids us from needing special branch prefixes and is hopefully future-proof.

Refs https://github.com/freedomofpress/infrastructure/issues/4603#issuecomment-1942883978.

Testing

  • Visual review + approval from infra (@mig5, et al.) that this is good with them

Copy link
Contributor

@mig5 mig5 left a comment

Choose a reason for hiding this comment

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

Looks good to me!

I guess we'll still want two source branches with differing versions of this file (and assume feature branches will branch off of those two branches respectively), I'll leave that to you / @zenmonkeykstop as to making those branches and adjusting this for the 4.2 branch (I assume main branch will be renamed to the 4.1 branch ?)

@zenmonkeykstop
Copy link
Contributor

main will probably move to 4.2, we can keep the 4.1 setting for bugfix releases and such off the last minor 4.1 release.

As we move towards 4.2, we'll still have a 4.1 branch for backports,
so the CI runner needs to know which Qubes version to test against.
Having this file will tell it what to do and avoids us from needing
special branch prefixes and is hopefully future-proof.

Refs <freedomofpress/infrastructure#4603 (comment)>.
@legoktm
Copy link
Member Author

legoktm commented Feb 20, 2024

(just rebased)

Copy link
Contributor

@zenmonkeykstop zenmonkeykstop left a comment

Choose a reason for hiding this comment

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

LGTM based on visual review. Can be updated once we flip the CI switch to 4.2 by default.

@zenmonkeykstop zenmonkeykstop merged commit 2813dab into main Feb 20, 2024
6 of 7 checks passed
@legoktm legoktm deleted the ci-qubes branch May 28, 2024 15:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

3 participants