diff --git a/.github/workflows/OrangeFox-OFRP.yml b/.github/workflows/OrangeFox-OFRP.yml index cd5b91b..2bb5f47 100644 --- a/.github/workflows/OrangeFox-OFRP.yml +++ b/.github/workflows/OrangeFox-OFRP.yml @@ -213,10 +213,10 @@ jobs: - name: Display Inputs run: | echo "Displaying variables/inputs." - echo "Manifest Branch: ${{ github.event.inputs.MANIFEST_BRANCH }}" - echo "Device Tree: ${{ github.event.inputs.DEVICE_TREE }}" - echo "Device Branch: ${{ github.event.inputs.DEVICE_TREE_BRANCH }}" - echo "Build Target: ${{ github.event.inputs.BUILD_TARGET }}image" + echo "Manifest Branch: ${{ inputs.MANIFEST_BRANCH }}" + echo "Device Tree: ${{ inputs.DEVICE_TREE }}" + echo "Device Branch: ${{ inputs.DEVICE_TREE_BRANCH }}" + echo "Build Target: ${{ inputs.BUILD_TARGET }}image" - name: Cleanup uses: rokibhasansagar/slimhub_actions@main @@ -228,7 +228,7 @@ jobs: - name: Check Manifest Branch run: | - if [ ${{ github.event.inputs.MANIFEST_BRANCH }} == 'v3_11.0' ] || [ ${{ github.event.inputs.MANIFEST_BRANCH }} == 'shrp-12.1' ]; then + if [ ${{ inputs.MANIFEST_BRANCH }} == 'v3_11.0' ] || [ ${{ inputs.MANIFEST_BRANCH }} == 'shrp-12.1' ]; then echo "CHECK_LEGACY_BRANCH=false" >> $GITHUB_ENV else echo "CHECK_LEGACY_BRANCH=true" >> $GITHUB_ENV @@ -262,7 +262,7 @@ jobs: cd android-recovery git config --global user.name "${{ github.actor }}" git config --global user.email "${{ github.actor_id }}+${{ github.actor }}@users.noreply.github.com" - repo init --depth=1 -u ${{ github.event.inputs.MANIFEST }} -b ${{ github.event.inputs.MANIFEST_BRANCH }} + repo init --depth=1 -u ${{ inputs.MANIFEST }} -b ${{ inputs.MANIFEST_BRANCH }} - name: Repo Sync run: | @@ -272,17 +272,17 @@ jobs: - name: Clone Device Tree run: | cd android-recovery - git clone ${{ github.event.inputs.DEVICE_TREE }} -b ${{ github.event.inputs.DEVICE_TREE_BRANCH }} ./${{ github.event.inputs.DEVICE_PATH }} - cd ${{ github.event.inputs.DEVICE_PATH }} + git clone ${{ inputs.DEVICE_TREE }} -b ${{ inputs.DEVICE_TREE_BRANCH }} ./${{ inputs.DEVICE_PATH }} + cd ${{ inputs.DEVICE_PATH }} echo "COMMIT_ID=$(git rev-parse HEAD)" >> $GITHUB_ENV - name: Check Build Makefile run: | cd android-recovery - if [ -f ${{ github.event.inputs.DEVICE_PATH }}/twrp_${{ github.event.inputs.DEVICE_NAME}}.mk ]; then - echo "DEVICE_MAKEFILE=twrp_${{ github.event.inputs.DEVICE_NAME }}" >> $GITHUB_ENV - elif [ -f ${{ github.event.inputs.DEVICE_PATH }}/omni_${{ github.event.inputs.DEVICE_NAME}}.mk ]; then - echo "DEVICE_MAKEFILE=omni_${{ github.event.inputs.DEVICE_NAME }}" >> $GITHUB_ENV + if [ -f ${{ inputs.DEVICE_PATH }}/twrp_${{ inputs.DEVICE_NAME}}.mk ]; then + echo "DEVICE_MAKEFILE=twrp_${{ inputs.DEVICE_NAME }}" >> $GITHUB_ENV + elif [ -f ${{ inputs.DEVICE_PATH }}/omni_${{ inputs.DEVICE_NAME}}.mk ]; then + echo "DEVICE_MAKEFILE=omni_${{ inputs.DEVICE_NAME }}" >> $GITHUB_ENV else echo "No recovery makefile file found!" fi @@ -298,8 +298,8 @@ jobs: cd android-recovery source build/envsetup.sh export ALLOW_MISSING_DEPENDENCIES=true - lunch ${{ env.DEVICE_MAKEFILE }}-eng && make clean && mka ${{ github.event.inputs.BUILD_TARGET }}image -j$(nproc --all) - echo "Done building your ${{ github.event.inputs.BUILD_TARGET }}.img" + lunch ${{ env.DEVICE_MAKEFILE }}-eng && make clean && mka ${{ inputs.BUILD_TARGET }}image -j$(nproc --all) + echo "Done building your ${{ inputs.BUILD_TARGET }}.img" - name: Check if the recovery exists if: always() @@ -328,23 +328,23 @@ jobs: uses: softprops/action-gh-release@master with: files: | - ${{ env.OUTPUT_DIR }}/${{ github.event.inputs.DEVICE_NAME }}/${{ inputs.BUILD_TARGET }}.img - ${{ env.OUTPUT_DIR }}/${{ github.event.inputs.DEVICE_NAME }}/SHRP*.zip - ${{ env.OUTPUT_DIR }}/${{ github.event.inputs.DEVICE_NAME }}/ramdisk*.* - name: Unofficial SHRP For ${{ github.event.inputs.DEVICE_NAME }} // ${{ env.BUILD_DATE }} + ${{ env.OUTPUT_DIR }}/${{ inputs.DEVICE_NAME }}/${{ inputs.BUILD_TARGET }}.img + ${{ env.OUTPUT_DIR }}/${{ inputs.DEVICE_NAME }}/SHRP*.zip + ${{ env.OUTPUT_DIR }}/${{ inputs.DEVICE_NAME }}/ramdisk*.* + name: Unofficial SHRP For ${{ inputs.DEVICE_NAME }} // ${{ env.BUILD_DATE }} tag_name: ${{ github.run_id }} body: | Build: ${{ env.MANIFEST_BRANCH }} - Device: [Device Tree/Branch](${{ github.event.inputs.DEVICE_TREE }}/tree/${{ github.event.inputs.DEVICE_TREE_BRANCH }}) - Commit: Most recent [commit](${{ github.event.inputs.DEVICE_TREE }}/commit/${{ env.COMMIT_ID }}) during building. + Device: [Device Tree/Branch](${{ inputs.DEVICE_TREE }}/tree/${{ inputs.DEVICE_TREE_BRANCH }}) + Commit: Most recent [commit](${{ inputs.DEVICE_TREE }}/commit/${{ env.COMMIT_ID }}) during building. - name: Run LDCheck - if: github.event.inputs.LDCHECK == 'true' + if: inputs.LDCHECK == 'true' run: | cd tools - mv -n libneeds ${GITHUB_WORKSPACE}/android-recovery/out/target/product/${{ github.event.inputs.DEVICE_NAME }}/recovery/root/ - mv -n ldcheck ${GITHUB_WORKSPACE}/android-recovery/out/target/product/${{ github.event.inputs.DEVICE_NAME }}/recovery/root/ - cd ../android-recovery/out/target/product/${{ github.event.inputs.DEVICE_NAME }}/recovery/root - python3 ldcheck -p system/lib64:vendor/lib64:system/lib:vendor/lib -d ${{ github.event.inputs.LDCHECKPATH }} + mv -n libneeds ${GITHUB_WORKSPACE}/${{OUTPUT_DIR}}/${{ inputs.DEVICE_NAME }}/recovery/root/ + mv -n ldcheck ${GITHUB_WORKSPACE}/${{OUTPUT_DIR}}/${{ inputs.DEVICE_NAME }}/recovery/root/ + cd ${GITHUB_WORKSPACE}/${{OUTPUT_DIR}}/${{ inputs.DEVICE_NAME }}/recovery/root + python3 ldcheck -p system/lib64:vendor/lib64:system/lib:vendor/lib -d ${{ inputs.LDCHECKPATH }} echo "Done checking missing dependencies. Review, and reconfigure your tree." continue-on-error: true