refactor: adapt to ubuntu-desktop-provision

canonical · Jul 21, 2023 · 6f4d70a · 6f4d70a
1 parent 925a505
commit 6f4d70a
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 7 deletions.
diff --git a/.github/workflows/installer.yaml b/.github/workflows/installer.yaml
@@ -30,7 +30,6 @@ jobs:
           submodules: recursive
 
       - name: Install dependencies
-        working-directory: packages/subiquity_client/subiquity
         run: |
           sudo apt update
           sudo apt install -y clang cmake curl libgtk-3-dev ninja-build pkg-config unzip xvfb

diff --git a/.github/workflows/wsl.yaml b/.github/workflows/wsl.yaml
@@ -40,7 +40,6 @@ jobs:
           submodules: recursive
 
       - name: Install dependencies
-        working-directory: packages/subiquity_client/subiquity
         run: |
           sudo apt update
           sudo apt install -y clang cmake curl libgtk-3-dev ninja-build pkg-config unzip xvfb

diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-SUBIQUITY_DIR = packages/subiquity_client/subiquity
+SUBIQUITY_DIR = vendor/ubuntu-desktop-provision/packages/subiquity_client/subiquity
 
 $(SUBIQUITY_DIR):
 	[ -d $(SUBIQUITY_DIR) ] || git submodule update --init --recursive

diff --git a/analysis_options.yaml b/analysis_options.yaml
@@ -6,6 +6,7 @@ analyzer:
     - "**/*.g.dart"
     - "**/*.mocks.dart"
     - "**/l10n/*.dart"
+    - "vendor/"
 
 linter:
   rules:

diff --git a/scripts/subiquity_integration b/scripts/subiquity_integration
@@ -11,7 +11,7 @@ class Tests(unittest.TestCase):
         with open('snap/snapcraft.yaml', 'r') as udi_snapcraft:
             udi_data = yaml.safe_load(udi_snapcraft)
 
-        with open('packages/subiquity_client/subiquity/snapcraft.yaml', 'r') \
+        with open('vendor/ubuntu-desktop-provision/packages/subiquity_client/subiquity/snapcraft.yaml', 'r') \
                 as subiquity_snapcraft:
             subiquity_data = yaml.safe_load(subiquity_snapcraft)
 

diff --git a/scripts/update-subiquity-deps b/scripts/update-subiquity-deps
@@ -10,7 +10,7 @@ yaml.indent(mapping=2, sequence=2, offset=2)
 with open('snap/snapcraft.yaml', 'r') as fp:
     udi_data = yaml.load(fp)
 
-with open('packages/subiquity_client/subiquity/snapcraft.yaml', 'r') as fp:
+with open('vendor/ubuntu-desktop-provision/packages/subiquity_client/subiquity/snapcraft.yaml', 'r') as fp:
     subiquity_data = yaml.load(fp)
 
 for part in ('probert', 'curtin'):

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
@@ -158,11 +158,11 @@ parts:
       mkdir -p $CRAFT_PART_INSTALL/bin/lib
       cp snap/local/launcher $CRAFT_PART_INSTALL/bin/
       cp snap/local/subiquity-server $CRAFT_PART_INSTALL/bin/
-      cp -r packages/subiquity_client/subiquity $CRAFT_PART_INSTALL/bin/
+      cp -r vendor/ubuntu-desktop-provision/packages/subiquity_client/subiquity $CRAFT_PART_INSTALL/bin/
       mkdir -p $CRAFT_PART_INSTALL/etc/subiquity
       cp -r snap/local/postinst.d $CRAFT_PART_INSTALL/etc/subiquity
       # https://github.com/canonical/ubuntu-desktop-installer/issues/1146
-      (cd packages/ubuntu_wizard && flutter pub get)
+      (cd vendor/ubuntu-desktop-provision/packages/ubuntu_wizard && flutter pub get)
       cd packages/ubuntu_desktop_installer
       flutter pub get
       flutter build linux --release -v