4 Ревизии c20ab19ef0 ... 9ac7646378

Автор SHA1 Съобщение Дата
  jimsterino98 9ac7646378 Allow patch command to fail without stopping преди 3 дни
  jimsterino98 98b464a01f Append KSU_VERSION to FILE_NAME in action.yml преди 3 дни
  jimsterino98 ce92abfe48 Change condition for root flavor setup преди 3 дни
  jimsterino98 0a4a5e1d9c Add 'none' option to root_flavor in workflow преди 3 дни
променени са 4 файла, в които са добавени 4 реда и са изтрити 3 реда
  1. 1 1
      .github/actions/file-name/action.yml
  2. 1 1
      .github/actions/susfs-patches/action.yml
  3. 1 1
      .github/workflows/build.yml
  4. 1 0
      .github/workflows/main.yml

+ 1 - 1
.github/actions/file-name/action.yml

@@ -56,7 +56,7 @@ runs:
          *) VARIANT_LABEL="KSUN" ;;
        esac
      fi
-     FILE_NAME="${ARTIFACT_BASE}-${VARIANT_LABEL}"
+     FILE_NAME="${ARTIFACT_BASE}-${VARIANT_LABEL}${KSU_VERSION}"
      [[ "${{ inputs.susfs }}" == "true" ]] && FILE_NAME="${FILE_NAME}-SUSFS"
      [[ "${{ inputs.zeromount }}" == "true" ]] && FILE_NAME="${FILE_NAME}-ZM"
      [[ "${{ inputs.nomount }}" == "true" ]] && FILE_NAME="${FILE_NAME}-NM"

+ 1 - 1
.github/actions/susfs-patches/action.yml

@@ -82,7 +82,7 @@ runs:
      shell: bash
      run: |
       cd "$COMMON"
-      patch -p1 < 50_add_susfs_in_gki-$ANDROID_VER-$KERNEL_VER.patch
+      patch -p1 < 50_add_susfs_in_gki-$ANDROID_VER-$KERNEL_VER.patch || true
       rm -rf 50_add_susfs_in_gki-$ANDROID_VER-$KERNEL_VER.patch
       shopt -s nullglob
       patches=("$KERNEL_PATCHES/samsung/$BRANCH"/*.patch)

+ 1 - 1
.github/workflows/build.yml

@@ -235,7 +235,7 @@ jobs:
           done
 
       - name: Setup Selected Root Implementation
-        if: inputs.root_flavor != ''
+        if: inputs.root_flavor != 'none'
         uses: ./.github/actions/root-setup
         with:
           flavor: ${{ inputs.root_flavor }}

+ 1 - 0
.github/workflows/main.yml

@@ -41,6 +41,7 @@ on:
         description: "Root Flavor"
         type: choice
         options:
+          - none
           - KernelSU-Next
           - KernelSU
           - ReSukiSU