canonical · d-loose · Sep 6, 2024 · Sep 5, 2024 · Jun 13, 2024 · Sep 6, 2024
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -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:

diff --git a/.gitmodules b/.gitmodules
@@ -1,4 +1,4 @@
 [submodule "subiquity"]
 	path = packages/subiquity_client/subiquity
 	url = https://github.com/canonical/subiquity.git
-	branch = ubuntu/noble
+	branch = main
diff --git a/ci/snap/bootstrap/local/launcher b/ci/snap/bootstrap/local/launcher
diff --git a/ci/snap/bootstrap/local/postinst.d/10_configure_auto_login b/ci/snap/bootstrap/local/postinst.d/10_configure_auto_login
diff --git a/ci/snap/bootstrap/local/postinst.d/10_copy_bluetooth_config b/ci/snap/bootstrap/local/postinst.d/10_copy_bluetooth_config
diff --git a/ci/snap/bootstrap/local/postinst.d/10_copy_network_config b/ci/snap/bootstrap/local/postinst.d/10_copy_network_config
diff --git a/ci/snap/bootstrap/local/postinst.d/10_flash_kernel b/ci/snap/bootstrap/local/postinst.d/10_flash_kernel
diff --git a/ci/snap/bootstrap/local/postinst.d/10_override_desktop_settings b/ci/snap/bootstrap/local/postinst.d/10_override_desktop_settings
diff --git a/ci/snap/bootstrap/local/postinst.d/50_zfs_cache b/ci/snap/bootstrap/local/postinst.d/50_zfs_cache
diff --git a/ci/snap/bootstrap/local/postinst.d/99_telemetry_done b/ci/snap/bootstrap/local/postinst.d/99_telemetry_done
diff --git a/ci/snap/bootstrap/local/subiquity-server b/ci/snap/bootstrap/local/subiquity-server
diff --git a/ci/snap/bootstrap/local/ubuntu-desktop-bootstrap.desktop b/ci/snap/bootstrap/local/ubuntu-desktop-bootstrap.desktop