Fix copy to nginx step and tidy up manifest

cawilliamson · Mar 13, 2024 · fc03202 · fc03202
1 parent 5fdd851
commit fc03202
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 18 deletions.
diff --git a/.github/workflows/build-gsi.yml b/.github/workflows/build-gsi.yml
@@ -135,7 +135,7 @@ jobs:
         buildDate=$(cat cachedBuildDate.txt)
         webDir="/var/www/html/${ROM_VERSION}-${buildDate}"
         mkdir -p "${webDir}"
-        cp -v *.img "${webDir}/"
+        cp -v *.img.xz "${webDir}/"
       working-directory: tmp
     - name: cleanup work directory
       uses: eviden-actions/clean-self-hosted-runner@v1

diff --git a/manifest.xml b/manifest.xml
@@ -12,18 +12,25 @@
   <remote name="ponces" fetch="https://github.com/ponces/" />
   <remote name="trebledroid" fetch="https://github.com/TrebleDroid/" />
 
-  <!-- andycgyan -->
+  <!-- andycgyan: qcrilam -->
   <project path="packages/apps/QcRilAm" name="android_packages_apps_QcRilAm" remote="andycgyan" revision="master" />
 
-  <!-- aosp -->
+  <!-- aosp: vndk-v28 -->
   <project path="prebuilts/vndk/v28" name="platform/prebuilts/vndk/v28" remote="aosp" clone-depth="1" revision="204f1bad00aaf480ba33233f7b8c2ddaa03155dd" />
 
-  <!-- calyxos -->
+  <!-- calyxos: aurora store extension -->
   <project path="packages/apps/AuroraStorePrivilegedExtension" name="platform_packages_apps_AuroraStorePrivilegedExtension" remote="calyxos" revision="android14" />
+
+  <!-- calyxos: f-droid extension -->
   <project path="packages/apps/F-DroidPrivilegedExtension" name="platform_packages_apps_F-DroidPrivilegedExtension" remote="calyxos" revision="android14" />
 
-  <!-- gapps -->
-  <project path="vendor/gapps" name="vendor_gapps" remote="mindthegapps" revision="upsilon" clone-depth="1" />
+  <!-- divested mobile: mulch webview -->
+  <remove-project name="LineageOS/android_external_chromium-webview_patches" />
+  <remove-project name="LineageOS/android_external_chromium-webview_prebuilt_arm" />
+  <remove-project name="LineageOS/android_external_chromium-webview_prebuilt_arm64" />
+  <remove-project name="LineageOS/android_external_chromium-webview_prebuilt_x86" />
+  <remove-project name="LineageOS/android_external_chromium-webview_prebuilt_x86_64" />
+  <project path="external/mulch-webview" name="mulch" remote="divested-mobile" revision="master" clone-depth="1" />
 
   <!-- grapheneos: apps -->
   <project path="external/Apps" name="platform_external_Apps" remote="grapheneos" revision="14" clone-depth="1" />
@@ -36,29 +43,34 @@
   <remove-project name="packages_apps_Launcher3" />
   <project path="packages/apps/Trebuchet" name="android_packages_apps_Trebuchet" remote="lineageos" revision="lineage-21.0" />
 
-  <!-- mulch -->
-  <remove-project name="LineageOS/android_external_chromium-webview_patches" />
-  <remove-project name="LineageOS/android_external_chromium-webview_prebuilt_arm" />
-  <remove-project name="LineageOS/android_external_chromium-webview_prebuilt_arm64" />
-  <remove-project name="LineageOS/android_external_chromium-webview_prebuilt_x86" />
-  <remove-project name="LineageOS/android_external_chromium-webview_prebuilt_x86_64" />
-  <project path="external/mulch-webview" name="mulch" remote="divested-mobile" revision="master" clone-depth="1" />
-
-  <!-- openeuicc -->
+  <!-- lmodroid: openeuicc -->
   <project path="packages/apps/OpenEUICC" name="platform_packages_apps_OpenEUICC" remote="lmodroid" revision="fourteen" />
 
-  <!-- phhusson -->
+  <!-- mindthegapps: gapps -->
+  <project path="vendor/gapps" name="vendor_gapps" remote="mindthegapps" revision="upsilon" clone-depth="1" />
+
+  <!-- phhusson: lptools  -->
   <project path="vendor/lptools" name="vendor_lptools" remote="phhusson" revision="master" />
+
+  <!-- phhusson: magisk vendor -->
   <project path="vendor/magisk" name="vendor_magisk" remote="phhusson" revision="android-10.0" />
+
+  <!-- phhusson: vndk tests -->
   <project path="vendor/vndk-tests" name="vendor_vndk-tests" remote="phhusson" revision="master" />
 
-  <!-- treble_adapter -->
+  <!-- ponces: treble_adapter -->
   <project name="treble_adapter" path="treble_adapter" remote="ponces" revision="master" />
   <project name="vendor_vndk" path="treble_adapter/vendor_vndk" remote="phhusson" revision="android-10.0" />
 
-  <!-- trebledroid -->
+  <!-- trebledroid: device  -->
   <project path="device/phh/treble" name="device_phh_treble" remote="trebledroid" revision="android-14.0" />
+
+  <!-- trebledroid: treble app -->
   <project path="treble_app" name="treble_app" remote="trebledroid" revision="master" />
+
+  <!-- trebledroid: hardware overlay -->
   <project path="vendor/hardware_overlay" name="vendor_hardware_overlay" remote="trebledroid" revision="pie" />
+
+  <!-- trebledroid: vendor interfaces -->
   <project path="vendor/interfaces" name="vendor_interfaces" remote="trebledroid" revision="android-14.0" />
 </manifest>