Просмотр исходного кода

Refactor branch conditionals in build.yml

fixed kernel configs if statement, try again
jimsterino98 6 месяцев назад
Родитель
Сommit
104dd632d5
1 измененных файлов с 28 добавлено и 16 удалено
  1. 28 16
      .github/workflows/build.yml

+ 28 - 16
.github/workflows/build.yml

@@ -243,7 +243,34 @@ jobs:
           CONFIG_TMPFS_POSIX_ACL=y
           EOF
 
-          if [[ "${{ inputs.branch }}" != "SM-S938B-Oneui7" ]]; then
+          if [[ "${{ inputs.branch }}" == "SM-S938B-Oneui7" ]]; then
+           echo "Nothing else needed"
+          elif [[ "${{ inputs.branch }}" == "SM-A546B-Oneui7" || "${{ inputs.branch }}" == "SM-A546E-Oneui7" ]]; then
+           cat >> "$DEFCONFIG" << 'EOF'
+           # nuke root protection
+           CONFIG_UH=n
+           CONFIG_UH_RKP=n
+           CONFIG_UH_LKMAUTH=n
+           CONFIG_UH_LKM_BLOCK=n
+           CONFIG_RKP_CFP_JOPP=n
+           CONFIG_RKP_CFP=n
+           CONFIG_SECURITY_DEFEX=n
+           CONFIG_PROCA=n
+           CONFIG_FIVE=n
+           
+           #Force Load Kernel Modules
+           CONFIG_MODULES=y
+           CONFIG_MODULE_FORCE_LOAD=y
+           CONFIG_MODULE_UNLOAD=y
+           CONFIG_MODULE_FORCE_UNLOAD=y
+           CONFIG_MODVERSIONS=y
+           CONFIG_MODULE_SRCVERSION_ALL=n
+           CONFIG_MODULE_SIG=n
+           CONFIG_MODULE_COMPRESS=n
+           CONFIG_TRIM_UNUSED_KSYMS=n
+           EOF
+           
+          else
            cat >> "$DEFCONFIG" << 'EOF'
            # nuke root protection
            CONFIG_UH=n
@@ -256,21 +283,6 @@ jobs:
            CONFIG_PROCA=n
            CONFIG_FIVE=n
            EOF
-          fi
-
-          if [[ "${{ inputs.branch }}" == "SM-A546B-Oneui7" || "${{ inputs.branch }}" == "SM-A546E-Oneui7" ]]; then
-          cat >> "$DEFCONFIG" << 'EOF'
-          #Force Load Kernel Modules
-          CONFIG_MODULES=y
-          CONFIG_MODULE_FORCE_LOAD=y
-          CONFIG_MODULE_UNLOAD=y
-          CONFIG_MODULE_FORCE_UNLOAD=y
-          CONFIG_MODVERSIONS=y
-          CONFIG_MODULE_SRCVERSION_ALL=n
-          CONFIG_MODULE_SIG=n
-          CONFIG_MODULE_COMPRESS=n
-          CONFIG_TRIM_UNUSED_KSYMS=n
-          EOF
           fi
           
           cd "$COMMON"