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

feat(bootstrap): track subiquity's main branch #811

Merged
merged 4 commits into from
Sep 6, 2024

Conversation

d-loose
Copy link
Member

@d-loose d-loose commented Sep 6, 2024

This sets up the main development branch in this repo to track subiquity's main branch. I've included @ogayot's change #769 for the type generator and used it to update the Dart classes. I also removed some remaining parts of the decommissioned WSL setup (see internal spec WS030), since the the corresponding types have been removed from subiquity.

For additional 24.04.x bug fixes we will use the new ubuntu/24.04, which still tracks subiquity's ubuntu/noble branch.

I'm also removing the remaining snapcraft files for ubuntu-desktop-bootstrap here.
We're migrating to the new setup (internal specs UD064 and UD068) with the snapcraft files now located on dedicated branches (snap/ubuntu-destkop-bootstrap/main in this case).
I'll follow up with a proper documentation update next week.

d-loose and others added 4 commits September 6, 2024 11:23
Subiquity is moving API types away from subiquity/common/types.py into
subiquity/common/types/{__init__,storage}.py. Ensure the makefile
follows the new architecture.

Signed-off-by: Olivier Gayot <[email protected]>
this also removes the now obsolete code related to the deprecated WSL
setup
We're deprecating the old rebase-flow for the installer and use
dedicated branches for snap builds now
(snap/ubuntu-desktop-bootstrap/*)
@d-loose d-loose marked this pull request as ready for review September 6, 2024 10:33
@d-loose
Copy link
Member Author

d-loose commented Sep 6, 2024

I've now built a snap, injected this into the current daily (20240906) and done a successful install.

Copy link
Collaborator

@spydon spydon left a comment

Choose a reason for hiding this comment

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

Lgtm

@d-loose d-loose merged commit c125c0d into canonical:main Sep 6, 2024
17 checks passed
github-actions bot pushed a commit that referenced this pull request Sep 6, 2024
This sets up the main development branch in this repo to track
subiquity's `main` branch. I've included @ogayot's change #769 for the
type generator and used it to update the Dart classes. I also removed
some remaining parts of the decommissioned WSL setup (see internal spec
WS030), since the the corresponding types have been removed from
subiquity.

For additional 24.04.x bug fixes we will use the new `ubuntu/24.04`,
which still tracks subiquity's `ubuntu/noble` branch.

I'm also removing the remaining snapcraft files for
ubuntu-desktop-bootstrap here.
We're migrating to the new setup (internal specs UD064 and UD068) with
the snapcraft files now located on dedicated branches
(`snap/ubuntu-destkop-bootstrap/main` in this case).
I'll follow up with a proper documentation update next week.
github-actions bot pushed a commit that referenced this pull request Sep 6, 2024
This sets up the main development branch in this repo to track
subiquity's `main` branch. I've included @ogayot's change #769 for the
type generator and used it to update the Dart classes. I also removed
some remaining parts of the decommissioned WSL setup (see internal spec
WS030), since the the corresponding types have been removed from
subiquity.

For additional 24.04.x bug fixes we will use the new `ubuntu/24.04`,
which still tracks subiquity's `ubuntu/noble` branch.

I'm also removing the remaining snapcraft files for
ubuntu-desktop-bootstrap here.
We're migrating to the new setup (internal specs UD064 and UD068) with
the snapcraft files now located on dedicated branches
(`snap/ubuntu-destkop-bootstrap/main` in this case).
I'll follow up with a proper documentation update next week.
d-loose added a commit to d-loose/ubuntu-desktop-provision that referenced this pull request Sep 6, 2024
includes:
- track subiquity's main branch (canonical#811)
- replace mascot on try-or-install-page (canonical#812)
d-loose added a commit to d-loose/ubuntu-desktop-provision that referenced this pull request Sep 6, 2024
includes:
- track subiquity's main branch (canonical#811)
- replace mascot on try-or-install-page (canonical#812)
d-loose added a commit that referenced this pull request Sep 6, 2024
includes:
- track subiquity's main branch (#811)
- replace mascot on try-or-install-page (#812)
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.

3 participants