Forráskód Böngészése

ci(workflows): disable glibc compatibility check condition

The condition check for glibc 2.38 compatibility was overly restrictive and causing build failures. Removing the conditional execution allows the fix to be applied more broadly when needed.
TheWildJames 11 hónapja
szülő
commit
941652783d
1 módosított fájl, 3 hozzáadás és 3 törlés
  1. 3 3
      .github/workflows/build.yml

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

@@ -154,14 +154,14 @@ jobs:
           fi
           fi
 
 
       - name: Apply glibc 2.38 Compatibility Fix
       - name: Apply glibc 2.38 Compatibility Fix
-        if: inputs.android_version == 'android14' &&  inputs.kernel_version == '6.1'
+        #if: inputs.android_version == 'android14' &&  inputs.kernel_version == '6.1'
         run: |
         run: |
-          if [ ! -e build/build.sh ]; then 
+          #if [ ! -e build/build.sh ]; then 
             GLIBC_VERSION=$(ldd --version 2>/dev/null | head -n 1 | awk '{print $NF}') 
             GLIBC_VERSION=$(ldd --version 2>/dev/null | head -n 1 | awk '{print $NF}') 
             if [ "$(printf '%s\n' "2.38" "$GLIBC_VERSION" | sort -V | head -n1)" = "2.38" ]; then 
             if [ "$(printf '%s\n' "2.38" "$GLIBC_VERSION" | sort -V | head -n1)" = "2.38" ]; then 
               cd $CONFIG/common/ && sed -i '/\$(Q)\$(MAKE) -C \$(SUBCMD_SRC) OUTPUT=\$(abspath \$(dir \$@))\/ \$(abspath \$@)/s//$(Q)$(MAKE) -C $(SUBCMD_SRC) EXTRA_CFLAGS="$(CFLAGS)" OUTPUT=$(abspath $(dir $@))\/ $(abspath $@)/' tools/bpf/resolve_btfids/Makefile 2>/dev/null || true
               cd $CONFIG/common/ && sed -i '/\$(Q)\$(MAKE) -C \$(SUBCMD_SRC) OUTPUT=\$(abspath \$(dir \$@))\/ \$(abspath \$@)/s//$(Q)$(MAKE) -C $(SUBCMD_SRC) EXTRA_CFLAGS="$(CFLAGS)" OUTPUT=$(abspath $(dir $@))\/ $(abspath $@)/' tools/bpf/resolve_btfids/Makefile 2>/dev/null || true
             fi 
             fi 
-          fi
+          #fi
 
 
       - name: Fix Less Then 6.6.50 Builds
       - name: Fix Less Then 6.6.50 Builds
         if: inputs.android_version == 'android15' && inputs.kernel_version == '6.6'
         if: inputs.android_version == 'android15' && inputs.kernel_version == '6.6'