diff --git a/.github/workflows/Recovery Build.yml b/.github/workflows/Recovery Build.yml index 97aa77988..0c1489151 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 @@ -36,7 +39,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 @@ -106,11 +109,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: Sync Device Dependencies run: | bash ${GITHUB_WORKSPACE}/scripts/convert.sh ${{ inputs.DEVICE_PATH }}/${{ steps.vendorname.outputs.prefix }}.dependencies @@ -133,19 +141,23 @@ 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: 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.* - name: ${{ steps.devicename.outputs.device}} (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.VERSION_TAGS }} env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}