Reorganize package lists (#292)

* Reorganize package lists * Update the action config for renamed config file
elementary · Jan 24, 2020 · 9436b64 · 9436b64
1 parent bef2923
commit 9436b64
Show file tree

Hide file tree

Showing 8 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/distinst-weekly.yml b/.github/workflows/distinst-weekly.yml
@@ -19,4 +19,4 @@ jobs:
 
     - name: Build and upload distinst .iso
       run: |
-        ./workflows.sh etc/terraform-daily-distinst-azure.conf "${{ secrets.key }}" "${{ secrets.secret }}" "${{ secrets.endpoint }}" "${{ secrets.bucket }}"
+        ./workflows.sh etc/terraform-daily-5.1-distinst-azure.conf "${{ secrets.key }}" "${{ secrets.secret }}" "${{ secrets.endpoint }}" "${{ secrets.bucket }}"
diff --git a/...ists.ubiquity/desktop.list.chroot_install → ...lists.default/desktop.list.chroot_install b/...ists.ubiquity/desktop.list.chroot_install → ...lists.default/desktop.list.chroot_install
diff --git a/...e-lists.ubiquity/desktop.list.chroot_live → ...ge-lists.default/desktop.list.chroot_live b/...e-lists.ubiquity/desktop.list.chroot_live → ...ge-lists.default/desktop.list.chroot_live
diff --git a/...g/package-lists.ubiquity/pool.list.binary → ...ig/package-lists.default/pool.list.binary b/...g/package-lists.ubiquity/pool.list.binary → ...ig/package-lists.default/pool.list.binary
diff --git a/etc/terraform-daily-5.1-azure.conf b/etc/terraform-daily-5.1-azure.conf
@@ -32,4 +32,4 @@ INCLUDE_APPCENTER="yes"
 OUTPUT_SUFFIX=""
 
 # folder suffix for the package lists to use
-PACKAGE_LISTS_SUFFIX="ubiquity"
+PACKAGE_LISTS_SUFFIX="default"
diff --git a/etc/terraform-daily-distinst-azure.conf → etc/terraform-daily-5.1-distinst-azure.conf b/etc/terraform-daily-distinst-azure.conf → etc/terraform-daily-5.1-distinst-azure.conf
diff --git a/etc/terraform-daily-6.0-azure.conf b/etc/terraform-daily-6.0-azure.conf
@@ -29,7 +29,7 @@ HWE=""
 INCLUDE_APPCENTER=""
 
 # suffix for generated .iso files
-OUTPUT_SUFFIX="-distinst"
+OUTPUT_SUFFIX=""
 
 # folder suffix for the package lists to use
-PACKAGE_LISTS_SUFFIX="distinst"
+PACKAGE_LISTS_SUFFIX="default"
diff --git a/etc/terraform-stable-azure.conf b/etc/terraform-stable-azure.conf
@@ -32,4 +32,4 @@ INCLUDE_APPCENTER="yes"
 OUTPUT_SUFFIX=""
 
 # folder suffix for the package lists to use
-PACKAGE_LISTS_SUFFIX="ubiquity"
+PACKAGE_LISTS_SUFFIX="default"