refactor: reorganize repository structure

Signed-off-by: ale5000 <15793015+ale5000-git@users.noreply.github.com>

Author: ale5000-git

.github/workflows/auto-nightly.yml

@@ -52,15 +52,15 @@ jobs:
         uses: actions/cache@v5
         timeout-minutes: 5
         with:
-          key: "build-${{ hashFiles('conf-2.sh') }}"
+          key: "build-${{ hashFiles('conf/full.inc.sh') }}"
           restore-keys: "build-"
           path: "cache/build"
           enableCrossOsArchive: true
       - name: "Use LFS cache"
         uses: actions/cache@v5
         timeout-minutes: 5
         with:
-          key: "lfs-${{ hashFiles('conf-lfs.sh') }}"
+          key: "lfs-${{ hashFiles('conf/lfs.inc.sh') }}"
           restore-keys: "lfs-"
           path: "cache/lfs"
           enableCrossOsArchive: true
@@ -267,14 +267,14 @@ jobs:
         with:
           lfs: false
           sparse-checkout: |
-            conf-2.sh
-            conf-lfs.sh
+            conf/full.inc.sh
+            conf/lfs.inc.sh
           sparse-checkout-cone-mode: false
       - name: "Ping build cache" # Cache expiration: 7 days
         uses: actions/cache/restore@v5
         timeout-minutes: 5
         with:
-          key: "build-${{ hashFiles('conf-2.sh') }}"
+          key: "build-${{ hashFiles('conf/full.inc.sh') }}"
           restore-keys: "build-"
           path: "cache/build"
           enableCrossOsArchive: true
@@ -283,7 +283,7 @@ jobs:
         uses: actions/cache/restore@v5
         timeout-minutes: 5
         with:
-          key: "lfs-${{ hashFiles('conf-lfs.sh') }}"
+          key: "lfs-${{ hashFiles('conf/lfs.inc.sh') }}"
           restore-keys: "lfs-"
           path: "cache/lfs"
           enableCrossOsArchive: true

.github/workflows/coverage.yml

@@ -47,15 +47,15 @@ jobs:
         uses: actions/cache/restore@v5
         timeout-minutes: 5
         with:
-          key: "build-${{ hashFiles('conf-2.sh') }}"
+          key: "build-${{ hashFiles('conf/full.inc.sh') }}"
           restore-keys: "build-"
           path: "cache/build"
           enableCrossOsArchive: true
       - name: "Use LFS cache"
         uses: actions/cache/restore@v5
         timeout-minutes: 5
         with:
-          key: "lfs-${{ hashFiles('conf-lfs.sh') }}"
+          key: "lfs-${{ hashFiles('conf/lfs.inc.sh') }}"
           restore-keys: "lfs-"
           path: "cache/lfs"
           enableCrossOsArchive: true

build.sh

@@ -99,10 +99,10 @@ esac
 save_last_title
 set_title 'Building the flashable OTA zip...'
 
-# shellcheck source=SCRIPTDIR/conf-1.sh
-. "${MAIN_DIR:?}/conf-1.sh"
-# shellcheck source=SCRIPTDIR/conf-2.sh
-if test "${OPENSOURCE_ONLY:?}" = 'false'; then . "${MAIN_DIR:?}/conf-2.sh"; fi
+# shellcheck source=SCRIPTDIR/conf/common.inc.sh
+. "${MAIN_DIR:?}/conf/common.inc.sh"
+# shellcheck source=SCRIPTDIR/conf/full.inc.sh
+if test "${OPENSOURCE_ONLY:?}" = 'false'; then . "${MAIN_DIR:?}/conf/full.inc.sh"; fi
 
 _init_dir="$(pwd)" || ui_error 'Failed to read the current dir' "${LINENO-}" "${FUNCNAME-}"
 

conf-1.sh conf/common.inc.shconf-1.sh renamed to conf/common.inc.sh

@@ -968,7 +968,7 @@ download_cached_if_lfs_pointer()
     local _expected_sha256 _mirror_url
 
     # shellcheck source=/dev/null
-    command 1> /dev/null -v 'get_mirror_by_sha256' || command . "${MAIN_DIR:?}/conf-lfs.sh" || _ui_error_local "Failed to source 'conf-lfs.sh'" "${LINENO-}" "${FUNCNAME-}"
+    command 1> /dev/null -v 'get_mirror_by_sha256' || command . "${MAIN_DIR:?}/conf/lfs.inc.sh" || _ui_error_local "Failed to source 'conf/lfs.inc.sh'" "${LINENO-}" "${FUNCNAME-}"
     _mirror_url="$(get_mirror_by_sha256 "${3:?}")" || _ui_error_local "Failed to get the mirror" "${LINENO-}" "${FUNCNAME-}"
 
     _expected_sha256=$(grep -m 1 -e '^oid sha256:' -- "${2:?}/${1:?}" | cut -d ':' -f 2 -s) || _ui_error_local "Failed to extract the SHA256 hash from the LFS pointer" "${LINENO-}" "${FUNCNAME-}"