Skip to content

Commit

Permalink
feat(bootstrap): track subiquity's main branch (#811)
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
d-loose authored Sep 6, 2024
2 parents bccef12 + b146ac1 commit c125c0d
Show file tree
Hide file tree
Showing 23 changed files with 8,080 additions and 9,713 deletions.
10 changes: 0 additions & 10 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,6 @@ jobs:
- uses: bluefireteam/melos-action@v3
- run: melos analyze --fatal-infos

consistency-check:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
with:
submodules: recursive
- name: Check actual subiquity submodule sha matches expected
run: |
ci/subiquity_integration
bootstrap:
runs-on: ubuntu-22.04
strategy:
Expand Down
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[submodule "subiquity"]
path = packages/subiquity_client/subiquity
url = https://github.com/canonical/subiquity.git
branch = ubuntu/noble
branch = main
46 changes: 0 additions & 46 deletions ci/snap/bootstrap/local/launcher

This file was deleted.

97 changes: 0 additions & 97 deletions ci/snap/bootstrap/local/postinst.d/10_configure_auto_login

This file was deleted.

11 changes: 0 additions & 11 deletions ci/snap/bootstrap/local/postinst.d/10_copy_bluetooth_config

This file was deleted.

17 changes: 0 additions & 17 deletions ci/snap/bootstrap/local/postinst.d/10_copy_network_config

This file was deleted.

11 changes: 0 additions & 11 deletions ci/snap/bootstrap/local/postinst.d/10_flash_kernel

This file was deleted.

28 changes: 0 additions & 28 deletions ci/snap/bootstrap/local/postinst.d/10_override_desktop_settings

This file was deleted.

36 changes: 0 additions & 36 deletions ci/snap/bootstrap/local/postinst.d/50_zfs_cache

This file was deleted.

23 changes: 0 additions & 23 deletions ci/snap/bootstrap/local/postinst.d/99_telemetry_done

This file was deleted.

31 changes: 0 additions & 31 deletions ci/snap/bootstrap/local/subiquity-server

This file was deleted.

12 changes: 0 additions & 12 deletions ci/snap/bootstrap/local/ubuntu-desktop-bootstrap.desktop

This file was deleted.

Loading

0 comments on commit c125c0d

Please sign in to comment.