Ver Fonte

ci: update actions for builds and kernel fixes

TheWildJames há 4 meses atrás
pai
commit
bbe582bee1

+ 11 - 12
.github/actions/cache-setup/action.yml

@@ -52,7 +52,7 @@ runs:
 
         export CCACHE_MAXSIZE="12G"
         echo CCACHE_MAXSIZE="$CCACHE_MAXSIZE" >> $GITHUB_ENV
-        export CCACHE_COMPILERCHECK="%compiler% -dumpmachine; %compiler% -dumpversion"
+        export CCACHE_COMPILERCHECK="content"
         echo CCACHE_COMPILERCHECK="$CCACHE_COMPILERCHECK" >> $GITHUB_ENV
         export CCACHE_BASEDIR="${{ github.workspace }}"
         echo CCACHE_BASEDIR="${{ github.workspace }}" >> $GITHUB_ENV
@@ -62,17 +62,16 @@ runs:
         echo CCACHE_IGNOREOPTIONS="--sysroot*" >> $GITHUB_ENV
         export CCACHE_COMPRESSION="true"
         echo CCACHE_COMPRESSION="true" >> $GITHUB_ENV
-        export CCACHE_COMPRESSLEVEL="9"
-        echo CCACHE_COMPRESSION_LEVEL="9" >> $GITHUB_ENV
-        # Temporarily disabled for cache hit testing
-        # export CCACHE_DIRECT="true"
-        # echo CCACHE_DIRECT="true" >> "$GITHUB_ENV"
-        # Temporarily disabled for cache hit testing
-        # export CCACHE_FILE_CLONE="true"
-        # echo CCACHE_FILE_CLONE="true" >> "$GITHUB_ENV"
-        # Temporarily disabled for cache hit testing
-        # export CCACHE_INODE_CACHE="true"
-        # echo CCACHE_INODE_CACHE="true" >> "$GITHUB_ENV"
+        export CCACHE_COMPRESSLEVEL="3"
+        echo CCACHE_COMPRESSION_LEVEL="3" >> $GITHUB_ENV
+        export CCACHE_DIRECT="true"
+        echo CCACHE_DIRECT="true" >> "$GITHUB_ENV"
+        Temporarily disabled for cache hit testing
+        export CCACHE_FILE_CLONE="true"
+        echo CCACHE_FILE_CLONE="true" >> "$GITHUB_ENV"
+        Temporarily disabled for cache hit testing
+        export CCACHE_INODE_CACHE="true"
+        echo CCACHE_INODE_CACHE="true" >> "$GITHUB_ENV"
         export CCACHE_IS_KERNEL_COMPILING="true"
         echo CCACHE_IS_KERNEL_COMPILING="true" >> $GITHUB_ENV
         export CCACHE_UMASK="002"

+ 11 - 2
.github/actions/droidspaces/action.yml

@@ -70,7 +70,16 @@ runs:
 
     - name: Fix 5.10
       shell: bash
-      if: inputs.version == 'android12-5.10'
+      if: inputs.version == 'android12-5.10' || inputs.version == 'android13-5.10'
       working-directory: ${{ github.workspace }}/kernel
       run: |
-        sed -i '/#ifdef CONFIG_PID_NS/,/#else/s/static inline struct pid_namespace \*get_pid_ns(struct pid_namespace \*ns)/extern struct pid_namespace *get_pid_ns(struct pid_namespace *ns);/' common/include/linux/pid_namespace.h
+        sed -i '0,/^[[:space:]]*static inline struct pid_namespace \*get_pid_ns(struct pid_namespace \*ns)[[:space:]]*$/s//extern struct pid_namespace *get_pid_ns(struct pid_namespace *ns);/' include/linux/pid_namespace.h
+        sed -i '0,/^[[:space:]]*extern struct pid_namespace \*get_pid_ns(struct pid_namespace \*ns);[[:space:]]*$/{
+        /^[[:space:]]*extern struct pid_namespace \*get_pid_ns(struct pid_namespace \*ns);[[:space:]]*$/{
+        n
+        :a
+        N
+        /\n[[:space:]]*}[[:space:]]*$/!ba
+        d
+        }
+        }' include/linux/pid_namespace.h