TheWildJames 4 месяцев назад
Родитель
Сommit
3fc194ae07
1 измененных файлов с 15 добавлено и 12 удалено
  1. 15 12
      .github/actions/bbr/action.yml

+ 15 - 12
.github/actions/bbr/action.yml

@@ -14,7 +14,7 @@ runs:
       run: |
         if [ "$inputs.kernel_version" == "6.1" ]; then
           cp $GITHUB_WORKSPACE/kernel_patches/bbrv3-a14-6.1.patch $GITHUB_WORKSPACE/kernel/common
-          patch -p1 < $GITHUB_WORKSPACE/kernel/common/bbrv3-a14-6.1.patch
+          patch -p1 < bbrv3-a14-6.1.patch
         fi
 
     - name: Fix modules.bzl
@@ -34,18 +34,21 @@ runs:
       shell: bash
       working-directory: ${{ github.workspace }}/kernel/common
       run: |
-        if [ "$inputs.kernel_version" == "6.1" ]; then
-          cat >> "${{ github.workspace }}/wild_gki.fragment" << 'EOF'
-          CONFIG_TCP_CONG_ADVANCED=y
-          CONFIG_TCP_CONG_BBR=y
-          CONFIG_DEFAULT_BBR=y
-          CONFIG_DEFAULT_TCP_CONG="bbr"
-          CONFIG_NET_SCH_FQ=y
+        set -euo pipefail
+        if [ "${{ inputs.kernel_version }}" = "6.1" ]; then
+          frag="${{ github.workspace }}/kernel/common/arch/arm64/configs/wild_gki.fragment"
 
-          # CONFIG_TCP_CONG_BIC is not set
-          # CONFIG_TCP_CONG_WESTWOOD is not set
-          # CONFIG_TCP_CONG_HTCP is not set
-          EOF
+          {
+            echo 'CONFIG_TCP_CONG_ADVANCED=y'
+            echo 'CONFIG_TCP_CONG_BBR=y'
+            echo 'CONFIG_DEFAULT_BBR=y'
+            echo 'CONFIG_DEFAULT_TCP_CONG="bbr"'
+            echo 'CONFIG_NET_SCH_FQ=y'
+            echo
+            echo '# CONFIG_TCP_CONG_BIC is not set'
+            echo '# CONFIG_TCP_CONG_WESTWOOD is not set'
+            echo '# CONFIG_TCP_CONG_HTCP is not set'
+          } >> "$frag"
         fi