Fix build

CaptainThrowback · Feb 17, 2024 · fb68bd3 · fb68bd3
1 parent 52f8682
commit fb68bd3
Showing 1 changed file with 8 additions and 12 deletions.
diff --git a/.github/workflows/Recovery Build.yml b/.github/workflows/Recovery Build.yml
@@ -67,12 +67,6 @@ jobs:
       with:
         swap-size-gb: 24
 
-    - name: Install OpenJDK
-      uses: actions/setup-java@v4
-      with:
-        distribution: zulu
-        java-version: 8
-
     - name: Prepare the build environment
       run: |
         sudo apt install git aria2 -y
@@ -86,29 +80,31 @@ jobs:
         cd OrangeFox_sync
         git clone https://gitlab.com/OrangeFox/sync.git
         cd sync
-        ./orangefox_sync.sh --branch ${{ inputs.MANIFEST_BRANCH }} --path ${{ github.workspace }}/${{ inputs.DEVICE_TREE_BRANCH }}
+        ./orangefox_sync.sh --branch ${{ inputs.MANIFEST_BRANCH }} --path ${{ github.workspace }}/fox_${{ inputs.MANIFEST_BRANCH }}
 
     - name: Place device trees and kernel
       run: |
         git clone ${{ inputs.DEVICE_TREE_URL }} ${{ inputs.DEVICE_PATH }}
-      working-directory: ${{ inputs.DEVICE_TREE_BRANCH }}
+      working-directory: fox_${{ inputs.MANIFEST_BRANCH }}
 
     - name: Build it
       run: |
+        set +e
         source build/envsetup.sh
         export ALLOW_MISSING_DEPENDENCIES=true
         export FOX_BUILD_DEVICE=${{ inputs.DEVICE_NAME }}
         export LC_ALL="C"
+        set -e
         lunch twrp_${{ inputs.DEVICE_NAME }}-eng && mka ${{ inputs.BUILD_TARGET }}image
-      working-directory: ${{ inputs.DEVICE_TREE_BRANCH }}
+      working-directory: fox_${{ inputs.MANIFEST_BRANCH }}
 
     - name: Upload to Release
       uses: softprops/action-gh-release@4634c16e79c963813287e889244c50009e7f0981
       with:
         files: |
-          workspace/out/target/product/${{ inputs.DEVICE_NAME }}/*${{ inputs.DEVICE_NAME }}*.img
-          workspace/out/target/product/${{ inputs.DEVICE_NAME }}/obj/PACKAGING/vendor_ramdisk_fragments_intermediates/recovery.*
-          workspace/out/target/product/${{ inputs.DEVICE_NAME }}/ramdisk-recovery.*
+          fox_${{ inputs.MANIFEST_BRANCH }}/out/target/product/${{ inputs.DEVICE_NAME }}/*${{ inputs.DEVICE_NAME }}*
+          fox_${{ inputs.MANIFEST_BRANCH }}/out/target/product/${{ inputs.DEVICE_NAME }}/obj/PACKAGING/vendor_ramdisk_fragments_intermediates/recovery.*
+          fox_${{ inputs.MANIFEST_BRANCH }}/out/target/product/${{ inputs.DEVICE_NAME }}/ramdisk-recovery.*
         name: |
           ${{ inputs.DEVICE_NAME }} (OrangeFox)
         tag_name: ${{ github.run_id }}