Эх сурвалжийг харах

Fix boot image inputs and droidspaces 5.15 patch gating

TheWildJames 4 сар өмнө
parent
commit
16cc8d0d59

+ 19 - 0
.github/actions/build-boot-images/action.yml

@@ -1,6 +1,20 @@
 name: 'Build Boot Images'
 description: 'Creates boot artifacts (boot.img, boot-gz.img, boot-lz4.img) and stores them in boot-artifacts/'
 
+inputs:
+  android_version:
+    description: 'Android version (e.g., android13)'
+    required: true
+  kernel_version:
+    description: 'Kernel version (e.g., 5.15)'
+    required: true
+  os_patch_level:
+    description: 'OS patch level (e.g., 2025-09)'
+    required: true
+  file_name:
+    description: 'Release file prefix for artifacts'
+    required: true
+
 runs:
   using: composite
   steps:
@@ -9,6 +23,11 @@ runs:
       run: |
         set -euo pipefail
 
+        ANDROID_VERSION="${{ inputs.android_version }}"
+        KERNEL_VERSION="${{ inputs.kernel_version }}"
+        OS_PATCH_LEVEL="${{ inputs.os_patch_level }}"
+        FILE_NAME="${{ inputs.file_name }}"
+
         mkdir -p bootimgs
         mkdir -p boot-artifacts
 

+ 1 - 1
.github/actions/droidspaces/action.yml

@@ -49,7 +49,7 @@ runs:
         elif [ "${{ inputs.version }}" == "android13-5.15" ]; then
           cp ${{ github.workspace }}/Droidspaces-OSS/Documentation/resources/kernel-patches/GKI/below-kernel-6.12/001.GKI-below-6.12-fix_sysvipc_kabi_6_7_8.patch ./
           patch -p1 < 001.GKI-below-6.12-fix_sysvipc_kabi_6_7_8.patch
-        elif [ "${{ inputs.version }}" == "android12-5.10" ] || [ "${{ inputs.version }}" == "android13-5.10" ] || [ "${{ inputs.version }}" == "android13-5.15" ]; then
+        elif [ "${{ inputs.version }}" == "android12-5.10" ] || [ "${{ inputs.version }}" == "android13-5.10" ]; then
           cp ${{ github.workspace }}/Droidspaces-OSS/Documentation/resources/kernel-patches/GKI/below-kernel-6.12/001.GKI-below-6.12-fix_sysvipc_kabi_6_7_8.patch ./
           patch -p1 < 001.GKI-below-6.12-fix_sysvipc_kabi_6_7_8.patch
           cp ${{ github.workspace }}/Droidspaces-OSS/Documentation/resources/kernel-patches/GKI/below-kernel-6.12/002.5.10_or_lower_use_android_abi_padding_for_posix_mqueue.patch ./

+ 5 - 0
.github/workflows/build.yml

@@ -274,6 +274,11 @@ jobs:
 
     - name: Create Bootimgs Folder and Build Boot Images
       uses: ./.github/actions/build-boot-images
+      with:
+        android_version: ${{ inputs.android_version }}
+        kernel_version: ${{ inputs.kernel_version }}
+        os_patch_level: ${{ inputs.os_patch_level }}
+        file_name: ${{ steps.extract.outputs.file_name }}
 
     - name: Upload Boot Image (boot.img)
       uses: actions/upload-artifact@v7