소스 검색

Update action.yml to streamline config application

Refactor the action steps to simplify config addition.
jimsterino98 1 개월 전
부모
커밋
cd09bd5f79
1개의 변경된 파일17개의 추가작업 그리고 30개의 파일을 삭제
  1. 17 30
      .github/actions/droidspaces/action.yml

+ 17 - 30
.github/actions/droidspaces/action.yml

@@ -8,7 +8,7 @@ inputs:
 runs:
  using: composite
  steps:
-  - name: apply patch and add configs
+  - name: apply patch(es)
     shell: bash
     run: |
      cd "$COMMON"
@@ -19,32 +19,19 @@ runs:
       patch -p1 < "$KERNEL_PATCHES/common/droidspaces/fix_abi_padding_for_posix_mqueue.patch"
      fi
 
-     cd "$GITHUB_WORKSPACE"
-     configs=(
-     "CONFIG_SYSVIPC=y"
-     "CONFIG_POSIX_MQUEUE=y"
-     "CONFIG_IPC_NS=y"
-     "CONFIG_PID_NS=y"
-     "CONFIG_DEVTMPFS=y"
-     "CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=y"
-     "CONFIG_NETFILTER_XT_TARGET_REJECT=y"
-     "CONFIG_NETFILTER_XT_TARGET_LOG=y"
-     "CONFIG_NETFILTER_XT_MATCH_RECENT=y"
-     "CONFIG_IP_SET=y"
-     "CONFIG_IP_SET_HASH_IP=y"
-     "CONFIG_IP_SET_HASH_NET=y"
-     "CONFIG_NETFILTER_XT_SET=y"
-     )
-     
-     for config in "${configs[@]}"; do
-         key="${config%%=*}"
-
-         if grep -qE "^(${key}=|# ${key} is not set$)" "$GKI_DEFCONFIG"; then
-             sed -i -E \
-                 -e "s/^${key}=.*/${config}/" \
-                 -e "s/^# ${key} is not set\$/${config}/" \
-                 "$GKI_DEFCONFIG"
-         else
-             echo "$config" >> "$GKI_DEFCONFIG"
-         fi
-     done
+  - name: add configs
+    shell: bash
+    run: |
+     "$COMMON/scripts/config" --file "$GKI_DEFCONFIG" --enable CONFIG_SYSVIPC
+     "$COMMON/scripts/config" --file "$GKI_DEFCONFIG" --enable CONFIG_POSIX_MQUEUE
+     "$COMMON/scripts/config" --file "$GKI_DEFCONFIG" --enable CONFIG_IPC_NS
+     "$COMMON/scripts/config" --file "$GKI_DEFCONFIG" --enable CONFIG_PID_NS
+     "$COMMON/scripts/config" --file "$GKI_DEFCONFIG" --enable CONFIG_DEVTMPFS
+     "$COMMON/scripts/config" --file "$GKI_DEFCONFIG" --enable CONFIG_NETFILTER_XT_MATCH_ADDRTYPE
+     "$COMMON/scripts/config" --file "$GKI_DEFCONFIG" --enable CONFIG_NETFILTER_XT_TARGET_REJECT
+     "$COMMON/scripts/config" --file "$GKI_DEFCONFIG" --enable CONFIG_NETFILTER_XT_TARGET_LOG
+     "$COMMON/scripts/config" --file "$GKI_DEFCONFIG" --enable CONFIG_NETFILTER_XT_MATCH_RECENT
+     "$COMMON/scripts/config" --file "$GKI_DEFCONFIG" --enable CONFIG_IP_SET
+     "$COMMON/scripts/config" --file "$GKI_DEFCONFIG" --enable CONFIG_IP_SET_HASH_IP
+     "$COMMON/scripts/config" --file "$GKI_DEFCONFIG" --enable CONFIG_IP_SET_HASH_NET
+     "$COMMON/scripts/config" --file "$GKI_DEFCONFIG" --enable CONFIG_NETFILTER_XT_SET