From 0532d4380c710422330ffa306adcca969ca6c719 Mon Sep 17 00:00:00 2001 From: himelpvz Date: Thu, 20 Nov 2025 20:53:04 +0600 Subject: [PATCH 01/10] Update Recovery Build.yml --- .github/workflows/Recovery Build.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/workflows/Recovery Build.yml b/.github/workflows/Recovery Build.yml index 97aa77988..609013248 100644 --- a/.github/workflows/Recovery Build.yml +++ b/.github/workflows/Recovery Build.yml @@ -110,6 +110,15 @@ jobs: run: | git clone ${{ inputs.DEVICE_TREE_URL }} -b ${{ inputs.DEVICE_TREE_BRANCH }} ./${{ inputs.DEVICE_PATH }} working-directory: workspace +- name: Fix fs_mgr missing libfscrypttwrp + run: | + FILE=system/core/fs_mgr/Android.bp + if grep -q "libfscrypttwrp" "$FILE"; then + echo "Patching $FILE: libfscrypttwrp -> libfscrypt" + sed -i 's/libfscrypttwrp/libfscrypt/g' "$FILE" + else + echo "No libfscrypttwrp references found in $FILE, skipping patch." + fi - name: Sync Device Dependencies run: | From e54a2a3f92e77ce94c7cbe025cc8ace6a31ef3c6 Mon Sep 17 00:00:00 2001 From: himelpvz Date: Thu, 20 Nov 2025 20:55:43 +0600 Subject: [PATCH 02/10] Update Recovery Build.yml --- .github/workflows/Recovery Build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Recovery Build.yml b/.github/workflows/Recovery Build.yml index 609013248..a6ba0c1f3 100644 --- a/.github/workflows/Recovery Build.yml +++ b/.github/workflows/Recovery Build.yml @@ -110,7 +110,7 @@ jobs: run: | git clone ${{ inputs.DEVICE_TREE_URL }} -b ${{ inputs.DEVICE_TREE_BRANCH }} ./${{ inputs.DEVICE_PATH }} working-directory: workspace -- name: Fix fs_mgr missing libfscrypttwrp + - name: Fix fs_mgr missing libfscrypttwrp run: | FILE=system/core/fs_mgr/Android.bp if grep -q "libfscrypttwrp" "$FILE"; then From 2b4d927030d971aa1ce6b90ceaba56aa5fa79073 Mon Sep 17 00:00:00 2001 From: himelpvz Date: Thu, 20 Nov 2025 20:57:39 +0600 Subject: [PATCH 03/10] Update Recovery Build.yml --- .github/workflows/Recovery Build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Recovery Build.yml b/.github/workflows/Recovery Build.yml index a6ba0c1f3..78d9051d7 100644 --- a/.github/workflows/Recovery Build.yml +++ b/.github/workflows/Recovery Build.yml @@ -36,7 +36,7 @@ on: jobs: build: if: github.event.repository.owner.id == github.event.sender.id - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 # You can use either of the ubuntu-20.04 or ubuntu-22.04 runner steps: - name: Display Run Parameters From 4f644784115979687f0af36eec6b8b710d1a487a Mon Sep 17 00:00:00 2001 From: Himel Parvez Date: Fri, 21 Nov 2025 13:46:25 +0600 Subject: [PATCH 04/10] Update Recovery Build.yml --- .github/workflows/Recovery Build.yml | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/.github/workflows/Recovery Build.yml b/.github/workflows/Recovery Build.yml index 78d9051d7..4b478110d 100644 --- a/.github/workflows/Recovery Build.yml +++ b/.github/workflows/Recovery Build.yml @@ -106,20 +106,16 @@ jobs: repo sync -j$(nproc --all) --force-sync working-directory: workspace + - name: Fix libfscrypttwrp missing dependency + run: | + cd workspace + sed -i 's/"libfscrypttwrp"/"libfscrypt"/g' system/core/fs_mgr/Android.bp + - name: Clone device tree run: | git clone ${{ inputs.DEVICE_TREE_URL }} -b ${{ inputs.DEVICE_TREE_BRANCH }} ./${{ inputs.DEVICE_PATH }} working-directory: workspace - - name: Fix fs_mgr missing libfscrypttwrp - run: | - FILE=system/core/fs_mgr/Android.bp - if grep -q "libfscrypttwrp" "$FILE"; then - echo "Patching $FILE: libfscrypttwrp -> libfscrypt" - sed -i 's/libfscrypttwrp/libfscrypt/g' "$FILE" - else - echo "No libfscrypttwrp references found in $FILE, skipping patch." - fi - + - name: Sync Device Dependencies run: | bash ${GITHUB_WORKSPACE}/scripts/convert.sh ${{ inputs.DEVICE_PATH }}/${{ steps.vendorname.outputs.prefix }}.dependencies From 745c7cf104bf05956c90246db99d76fb5e66dba4 Mon Sep 17 00:00:00 2001 From: Himel Parvez Date: Thu, 27 Nov 2025 11:26:30 +0600 Subject: [PATCH 05/10] Add vendor_ramdisk to recovery build artifacts --- .github/workflows/Recovery Build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/Recovery Build.yml b/.github/workflows/Recovery Build.yml index 4b478110d..3321e42f4 100644 --- a/.github/workflows/Recovery Build.yml +++ b/.github/workflows/Recovery Build.yml @@ -147,6 +147,7 @@ jobs: workspace/out/target/product/${{ steps.devicename.outputs.device }}/*${{ steps.devicename.outputs.device }}* workspace/out/target/product/${{ steps.devicename.outputs.device }}/obj/PACKAGING/vendor_ramdisk_fragments_intermediates/recovery.* workspace/out/target/product/${{ steps.devicename.outputs.device }}/ramdisk-recovery.* + workspace/out/target/product/${{ inputs.DEVICE_NAME }}/vendor_ramdisk.* name: ${{ steps.devicename.outputs.device}} (SHRP) tag_name: ${{ github.run_id }} body: | From 9d6c1e31ce3265b958cb79b40fbc18cce6e55c34 Mon Sep 17 00:00:00 2001 From: Himel Parvez Date: Thu, 27 Nov 2025 16:20:21 +0600 Subject: [PATCH 06/10] Add directory listing step in Recovery Build workflow Add a step to list files in the output directory. --- .github/workflows/Recovery Build.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/Recovery Build.yml b/.github/workflows/Recovery Build.yml index 3321e42f4..202f476a0 100644 --- a/.github/workflows/Recovery Build.yml +++ b/.github/workflows/Recovery Build.yml @@ -138,7 +138,9 @@ jobs: lunch ${{ inputs.DEVICE_MAKEFILE }}-eng mka $(tr -d _ <<< ${{ inputs.BUILD_TARGET }})image working-directory: workspace - + - name: ls pwd and directory + run: | + ls -lR workspace/out/target/product/${{ inputs.DEVICE_NAME }}/ - name: Upload to Release uses: softprops/action-gh-release@4634c16e79c963813287e889244c50009e7f0981 with: From 6713f61c216a8f8d973196e0648bd9ad894d88db Mon Sep 17 00:00:00 2001 From: Himel Parvez Date: Thu, 27 Nov 2025 16:26:34 +0600 Subject: [PATCH 07/10] Enhance Recovery Build.yml with VERSION_TAGS input Add VERSION_TAGS input to Recovery Build workflow --- .github/workflows/Recovery Build.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/Recovery Build.yml b/.github/workflows/Recovery Build.yml index 202f476a0..f16b6d777 100644 --- a/.github/workflows/Recovery Build.yml +++ b/.github/workflows/Recovery Build.yml @@ -3,6 +3,9 @@ name: Recovery Build on: workflow_dispatch: inputs: + VERSION_TAGS: + description: Write version name or any custom text. + required: false MANIFEST_BRANCH: description: Manifest Branch required: true From 1b9a4366b04bbc013ba19c73ba06d48b92cf245e Mon Sep 17 00:00:00 2001 From: Himel Parvez Date: Thu, 27 Nov 2025 16:38:27 +0600 Subject: [PATCH 08/10] Update recovery build workflow to include manifest branch --- .github/workflows/Recovery Build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/Recovery Build.yml b/.github/workflows/Recovery Build.yml index f16b6d777..844a09d34 100644 --- a/.github/workflows/Recovery Build.yml +++ b/.github/workflows/Recovery Build.yml @@ -153,10 +153,11 @@ jobs: workspace/out/target/product/${{ steps.devicename.outputs.device }}/obj/PACKAGING/vendor_ramdisk_fragments_intermediates/recovery.* workspace/out/target/product/${{ steps.devicename.outputs.device }}/ramdisk-recovery.* workspace/out/target/product/${{ inputs.DEVICE_NAME }}/vendor_ramdisk.* - name: ${{ steps.devicename.outputs.device}} (SHRP) + name: ${{ inputs.MANIFEST_BRANCH }}_${{ inputs.DEVICE_NAME }} (SHRP) tag_name: ${{ github.run_id }} body: | Manifest: ${{ inputs.MANIFEST_BRANCH }} Target: ${{ inputs.BUILD_TARGET }}.img + Version: ${{ inputs.MANIFEST_BRANCH }} env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 893102e43336b8a1d70f32ee8ac08233d1399fb4 Mon Sep 17 00:00:00 2001 From: Himel Parvez Date: Sat, 29 Nov 2025 00:34:06 +0600 Subject: [PATCH 09/10] Update Recovery Build.yml --- .github/workflows/Recovery Build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/Recovery Build.yml b/.github/workflows/Recovery Build.yml index 844a09d34..5c87fcc3b 100644 --- a/.github/workflows/Recovery Build.yml +++ b/.github/workflows/Recovery Build.yml @@ -150,10 +150,10 @@ jobs: files: | workspace/out/target/product/${{ steps.devicename.outputs.device }}/${{ inputs.BUILD_TARGET }}.img workspace/out/target/product/${{ steps.devicename.outputs.device }}/*${{ steps.devicename.outputs.device }}* - workspace/out/target/product/${{ steps.devicename.outputs.device }}/obj/PACKAGING/vendor_ramdisk_fragments_intermediates/recovery.* + workspace/out/target/product/${{ steps.devicename.outputs.device }}/obj/PACKAGING/vendor_ramdisk_intermediates/recovery.* workspace/out/target/product/${{ steps.devicename.outputs.device }}/ramdisk-recovery.* workspace/out/target/product/${{ inputs.DEVICE_NAME }}/vendor_ramdisk.* - name: ${{ inputs.MANIFEST_BRANCH }}_${{ inputs.DEVICE_NAME }} (SHRP) + name: ${{ inputs.MANIFEST_BRANCH }}_${{ inputs.DEVICE_NAME }} (SHRP) tag_name: ${{ github.run_id }} body: | Manifest: ${{ inputs.MANIFEST_BRANCH }} From b23acad6f981a68e328106d495dd8729f2387023 Mon Sep 17 00:00:00 2001 From: Himel Parvez Date: Sat, 29 Nov 2025 01:20:21 +0600 Subject: [PATCH 10/10] Update Recovery Build.yml --- .github/workflows/Recovery Build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/Recovery Build.yml b/.github/workflows/Recovery Build.yml index 5c87fcc3b..0c1489151 100644 --- a/.github/workflows/Recovery Build.yml +++ b/.github/workflows/Recovery Build.yml @@ -152,12 +152,12 @@ jobs: workspace/out/target/product/${{ steps.devicename.outputs.device }}/*${{ steps.devicename.outputs.device }}* workspace/out/target/product/${{ steps.devicename.outputs.device }}/obj/PACKAGING/vendor_ramdisk_intermediates/recovery.* workspace/out/target/product/${{ steps.devicename.outputs.device }}/ramdisk-recovery.* - workspace/out/target/product/${{ inputs.DEVICE_NAME }}/vendor_ramdisk.* - name: ${{ inputs.MANIFEST_BRANCH }}_${{ inputs.DEVICE_NAME }} (SHRP) + workspace/out/target/product/${{ steps.devicename.outputs.device }}/vendor_ramdisk.* + name: ${{ inputs.MANIFEST_BRANCH }}_${{ steps.devicename.outputs.device }} (SHRP) tag_name: ${{ github.run_id }} body: | Manifest: ${{ inputs.MANIFEST_BRANCH }} Target: ${{ inputs.BUILD_TARGET }}.img - Version: ${{ inputs.MANIFEST_BRANCH }} + Version: ${{ inputs.VERSION_TAGS }} env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}