Переглянути джерело

fix(action): update GITHUB_WORKSPACE to github.workspace in action.yml files

TheWildJames 4 місяців тому
батько
коміт
60b85ffc49

+ 2 - 2
.github/actions/apply-kernel-branding/action.yml

@@ -21,10 +21,10 @@ runs:
       shell: bash
       working-directory: ${{ github.workspace }}/kernel/common
       run: |
-        CONFIG_FRAGMENT="${GITHUB_WORKSPACE}/wild_gki.fragment"
+        CONFIG_FRAGMENT="${{ github.workspace }}/wild_gki.fragment"
         touch "$CONFIG_FRAGMENT"
 
-        DEFCONFIG="${GITHUB_WORKSPACE}/kernel/common/arch/arm64/configs/gki_defconfig"
+        DEFCONFIG="${{ github.workspace }}/kernel/common/arch/arm64/configs/gki_defconfig"
 
         if [ "${{ inputs.variant }}" == "Wild" ]; then
           tac scripts/setlocalversion | awk '!seen && /^echo / {seen=1; next} 1' | tac > scripts/setlocalversion.tmp

+ 8 - 8
.github/actions/build-boot-images/action.yml

@@ -12,17 +12,17 @@ runs:
         mkdir -p bootimgs
         mkdir -p boot-artifacts
 
-        if [ -f "$GITHUB_WORKSPACE/kernel/out/$ANDROID_VERSION-$KERNEL_VERSION/dist/Image" ]; then
-          cp "$GITHUB_WORKSPACE/kernel/out/$ANDROID_VERSION-$KERNEL_VERSION/dist/Image" "$GITHUB_WORKSPACE/bootimgs/Image"
-          cp "$GITHUB_WORKSPACE/kernel/out/$ANDROID_VERSION-$KERNEL_VERSION/dist/Image.lz4" "$GITHUB_WORKSPACE/bootimgs/Image.lz4"
+        if [ -f "${{ github.workspace }}/kernel/out/$ANDROID_VERSION-$KERNEL_VERSION/dist/Image" ]; then
+          cp "${{ github.workspace }}/kernel/out/$ANDROID_VERSION-$KERNEL_VERSION/dist/Image" "${{ github.workspace }}/bootimgs/Image"
+          cp "${{ github.workspace }}/kernel/out/$ANDROID_VERSION-$KERNEL_VERSION/dist/Image.lz4" "${{ github.workspace }}/bootimgs/Image.lz4"
         else
-          cp "$GITHUB_WORKSPACE/kernel/bazel-bin/common/kernel_aarch64/Image" "$GITHUB_WORKSPACE/bootimgs/Image"
-          cp "$GITHUB_WORKSPACE/kernel/bazel-bin/common/kernel_aarch64/Image.lz4" "$GITHUB_WORKSPACE/bootimgs/Image.lz4"
+          cp "${{ github.workspace }}/kernel/bazel-bin/common/kernel_aarch64/Image" "${{ github.workspace }}/bootimgs/Image"
+          cp "${{ github.workspace }}/kernel/bazel-bin/common/kernel_aarch64/Image.lz4" "${{ github.workspace }}/bootimgs/Image.lz4"
         fi
 
-        gzip -n -k -f -9 "$GITHUB_WORKSPACE/bootimgs/Image" > "$GITHUB_WORKSPACE/bootimgs/Image.gz"
+        gzip -n -k -f -9 "${{ github.workspace }}/bootimgs/Image" > "${{ github.workspace }}/bootimgs/Image.gz"
 
-        cd "$GITHUB_WORKSPACE/bootimgs"
+        cd "${{ github.workspace }}/bootimgs"
 
         case "$ANDROID_VERSION" in
           android12)
@@ -67,5 +67,5 @@ runs:
           fi
 
           "$AVBTOOL" add_hash_footer --partition_name boot --partition_size $((64 * 1024 * 1024)) --image "$output_image" --algorithm SHA256_RSA2048 --key "$BOOT_SIGN_KEY_PATH"
-          cp "$output_image" "$GITHUB_WORKSPACE/boot-artifacts/${FILE_NAME}-${output_image}"
+          cp "$output_image" "${{ github.workspace }}/boot-artifacts/${FILE_NAME}-${output_image}"
         done

+ 2 - 2
.github/actions/build-kernel/action.yml

@@ -15,7 +15,7 @@ runs:
         SKIP_CP_KERNEL_HDR=1 \
         SKIP_MRPROPER=1 \
         LTO=thin \
-        GKI_DEFCONFIG_FRAGMENT="$GITHUB_WORKSPACE/wild_gki.fragment" \
+        GKI_DEFCONFIG_FRAGMENT="${{ github.workspace }}/wild_gki.fragment" \
         BUILD_CONFIG=common/build.config.gki.aarch64 \
         build/build.sh -j"$(nproc)" \
         CC="$CC" \
@@ -25,7 +25,7 @@ runs:
         LD="$LD" \
         HOSTLD="$HOSTLD"
       else
-        cp "$GITHUB_WORKSPACE/wild_gki.fragment" common/arch/arm64/configs/wild_gki.fragment
+        cp "${{ github.workspace }}/wild_gki.fragment" common/arch/arm64/configs/wild_gki.fragment
         tools/bazel build \
           --linkopt="--thinlto-cache-dir=/home/runner/.ld_cache" \
           --config=fast \

+ 6 - 6
.github/actions/cache-setup/action.yml

@@ -51,8 +51,8 @@ runs:
         echo CCACHE_MAXSIZE="$CCACHE_MAXSIZE" >> $GITHUB_ENV
         export CCACHE_COMPILERCHECK="%compiler% -dumpmachine; %compiler% -dumpversion"
         echo CCACHE_COMPILERCHECK="$CCACHE_COMPILERCHECK" >> $GITHUB_ENV
-        export CCACHE_BASEDIR="${GITHUB_WORKSPACE}"
-        echo CCACHE_BASEDIR="${GITHUB_WORKSPACE}" >> $GITHUB_ENV
+        export CCACHE_BASEDIR="${{ github.workspace }}"
+        echo CCACHE_BASEDIR="${{ github.workspace }}" >> $GITHUB_ENV
         export CCACHE_NOHASHDIR="true"
         echo CCACHE_NOHASHDIR="true" >> $GITHUB_ENV
         export CCACHE_IGNOREOPTIONS="--sysroot*"
@@ -119,15 +119,15 @@ runs:
         mkdir -p "$LDCACHE_DIR"
           
         # Create LD wrapper for thin-LTO caching
-        cat > "$GITHUB_WORKSPACE/kernel/common/ld-wrapper" << 'EOF'
+        cat > "${{ github.workspace }}/kernel/common/ld-wrapper" << 'EOF'
         #!/bin/bash
         ld.lld "$@" --thinlto-cache-dir="$LDCACHE_DIR" --thinlto-jobs="$(nproc --all)"
         EOF
-        chmod +x "$GITHUB_WORKSPACE/kernel/common/ld-wrapper"
+        chmod +x "${{ github.workspace }}/kernel/common/ld-wrapper"
 
         # Setup cache directories
-        echo "LD=$GITHUB_WORKSPACE/kernel/common/ld-wrapper" >> "$GITHUB_ENV"
-        echo "HOSTLD=$GITHUB_WORKSPACE/kernel/common/ld-wrapper" >> "$GITHUB_ENV"
+        echo "LD=${{ github.workspace }}/kernel/common/ld-wrapper" >> "$GITHUB_ENV"
+        echo "HOSTLD=${{ github.workspace }}/kernel/common/ld-wrapper" >> "$GITHUB_ENV"
 
         echo "✅ LD Cache ready"
         echo "LDCACHE_DIR: $LDCACHE_DIR"

+ 23 - 35
.github/actions/droidspaces/action.yml

@@ -17,55 +17,43 @@ inputs:
 runs:
   using: composite
   steps:
+    - name: Download and Apply Droidspaces-OSS Patches
+      shell: bash
+      working-directory: ${{ github.workspace }}
+      run: |
+        git clone --depth=1 https://github.com/ravindu644/Droidspaces-OSS.git
+
     - name: Apply the SYSVIPC kABI fix
       shell: bash
-      if: false
       working-directory: ${{ github.workspace }}/kernel/common
       run: |
         if [ "${{ inputs.kernel_version }}" == "6.12" ]; then
-          curl -L https://raw.githubusercontent.com/ravindu644/Droidspaces-OSS/main/Documentation/resources/kernel-patches/GKI/kernel-6.12/001.GKI-6.12-or-above-fix_sysvipc_kabi.patch | patch -p1
-        #elif [ "${{ inputs.kernel_version }}" == "6.6" ] || [ "${{ inputs.kernel_version }}" == "6.1" ]; then
-        else
+          cp ${{ github.workspace }}/Droidspaces-OSS/Documentation/resources/kernel-patches/GKI/kernel-6.12/001.GKI-6.12-or-above-fix_sysvipc_kabi.patch ./
+        elif [ "${{ inputs.kernel_version }}" == "6.6" ] || [ "${{ inputs.kernel_version }}" == "6.1" ]; then
           #curl -L https://raw.githubusercontent.com/ravindu644/Droidspaces-OSS/main/Documentation/resources/kernel-patches/GKI/below-kernel-6.12/001.GKI-below-6.12-fix_sysvipc_kabi_1_2_3.patch | patch -p1
           #curl -L https://raw.githubusercontent.com/ravindu644/Droidspaces-OSS/main/Documentation/resources/kernel-patches/GKI/below-kernel-6.12/001.GKI-below-6.12-fix_sysvipc_kabi_3_4_5.patch | patch -p1
-          curl -L https://raw.githubusercontent.com/ravindu644/Droidspaces-OSS/main/Documentation/resources/kernel-patches/GKI/below-kernel-6.12/001.GKI-below-6.12-fix_sysvipc_kabi_6_7_8.patch | patch -p1
+          cp ${{ github.workspace }}/Droidspaces-OSS/main/Documentation/resources/kernel-patches/GKI/below-kernel-6.12/001.GKI-below-6.12-fix_sysvipc_kabi_6_7_8.patch ./
+          patch -p1 < 001.GKI-below-6.12-fix_sysvipc_kabi_6_7_8.patch
+        elif [ "${{ inputs.kernel_version }}" == "5.15" ]; then
+          cp ${{ github.workspace }}/Droidspaces-OSS/main/Documentation/resources/kernel-patches/GKI/below-kernel-6.12/001.GKI-below-6.12-fix_sysvipc_kabi_6_7_8.patch ./
+          patch -p1 < 001.GKI-below-6.12-fix_sysvipc_kabi_6_7_8.patch
+        elif [ "${{ inputs.kernel_version }}" == "5.10" ]; then
+          cp ${{ github.workspace }}/Droidspaces-OSS/main/Documentation/resources/kernel-patches/GKI/below-kernel-6.12/001.GKI-below-6.12-fix_sysvipc_kabi_6_7_8.patch ./
+          patch -p1 < 001.GKI-below-6.12-fix_sysvipc_kabi_6_7_8.patch
+          cp ${{ github.workspace }}/Droidspaces-OSS/main/Documentation/resources/kernel-patches/GKI/below-kernel-6.12/002.5.10_or_lower_use_android_abi_padding_for_posix_mqueue.patch ./
+          patch -p1 < 002.5.10_or_lower_use_android_abi_padding_for_posix_mqueue.patch
         fi
 
     - name: Enable Configs
       shell: bash
-      if: false
       working-directory: ${{ github.workspace }}/kernel
       run: |
         cat >> "${{ github.workspace }}/wild_gki.fragment" << 'EOF'
-        # Kernel configurations for full DroidSpaces support for GKI
-        # Copyright (C) 2026 ravindu644 <droidcasts@protonmail.com>
-
-        # IPC
         CONFIG_SYSVIPC=y
-        CONFIG_POSIX_MQUEUE=y
-
-        # Namespaces
-        CONFIG_IPC_NS=y
-        CONFIG_PID_NS=y
-
-        # HW Access Support
         CONFIG_DEVTMPFS=y
+        CONFIG_PID_NS=y
+        CONFIG_POSIX_MQUEUE=y
+        CONFIG_NETFILTER_XT_TARGET_REJECT=y
+        CONFIG_NETFILTER_XT_TARGET_LOG=y
+        CONFIG_NETFILTER_XT_MATCH_RECENT=y
         EOF
-
-    - name: Apply Android 15 6.6 Fixes
-      if: false
-      shell: bash
-      working-directory: ${{ github.workspace }}/kernel/common
-      run: |
-        SUBLEVEL=${{ env.SUBLEVEL }}
-        SUSFS_VERSION=${{ env.SUSFS_VERSION }}
-
-        if [[ "$SUBLEVEL" -le 92 ]]; then
-          cp ${{ github.workspace }}/kernel_patches/wild/susfs_fix_patches/${SUSFS_VERSION}/a15-6.6/base.c.patch ./
-          patch -p1 < base.c.patch
-        fi
-
-        if [[ "$SUBLEVEL" -le 58 ]]; then
-          cp ${{ github.workspace }}/kernel_patches/wild/susfs_fix_patches/${SUSFS_VERSION}/a15-6.6/task_mmu.c.patch ./
-          patch -p1 < task_mmu.c.patch
-        fi

+ 2 - 2
.github/actions/extract-sublevel-file-name/action.yml

@@ -19,8 +19,8 @@ runs:
         set -euo pipefail
 
         SUBLEVEL="${SUB_LEVEL}"
-        if [ -f "$GITHUB_WORKSPACE/kernel/common/Makefile" ]; then
-          EXTRACTED="$(grep '^SUBLEVEL = ' "$GITHUB_WORKSPACE/kernel/common/Makefile" | awk '{print $3}')"
+        if [ -f "${{ github.workspace }}/kernel/common/Makefile" ]; then
+          EXTRACTED="$(grep '^SUBLEVEL = ' "${{ github.workspace }}/kernel/common/Makefile" | awk '{print $3}')"
           if [ -n "$EXTRACTED" ]; then SUBLEVEL="$EXTRACTED"; fi
         fi
 

+ 1 - 1
.github/actions/kernel-fixes/action.yml

@@ -63,7 +63,7 @@ runs:
         echo "[INFO] Checking for android15 + kernel 6.6 include fix..."
         if [[ "${{ inputs.android_version }}" == "android15" && "${{ inputs.kernel_version }}" == "6.6" ]]; then
           echo "[MATCH] android15 + 6.6, checking for fs.h include."
-          cd "$GITHUB_WORKSPACE/kernel/common"
+          cd "${{ github.workspace }}/kernel/common"
           if ! grep -qxF '#include <trace/hooks/fs.h>' ./fs/namespace.c; then
             echo "[INFO] Adding missing #include <trace/hooks/fs.h> to fs/namespace.c."
             sed -i '/#include <trace\/hooks\/blk.h>/a #include <trace\/hooks\/fs.h>' ./fs/namespace.c

+ 2 - 2
.github/actions/module-check-bypass/action.yml

@@ -14,9 +14,9 @@ runs:
 
         KERNEL_VERSION="${{ inputs.kernel_version }}"
         if [[ "$KERNEL_VERSION" == "6.1" || "$KERNEL_VERSION" == "6.6" || "$KERNEL_VERSION" == "6.12" ]]; then
-          TARGET_FILE="$GITHUB_WORKSPACE/kernel/common/kernel/module/version.c"
+          TARGET_FILE="${{ github.workspace }}/kernel/common/kernel/module/version.c"
         else
-          TARGET_FILE="$GITHUB_WORKSPACE/kernel/common/kernel/module.c"
+          TARGET_FILE="${{ github.workspace }}/kernel/common/kernel/module.c"
         fi
 
         sed -i '/bad_version:/{:a;n;/return 0;/{s/return 0;/return 1;/;b};ba}' "$TARGET_FILE"

+ 10 - 19
.github/actions/networking/action.yml

@@ -19,29 +19,15 @@ runs:
         set -euo pipefail
         curl -L https://raw.githubusercontent.com/ahmed-alnassif/GKI-Duchamp/dev/kernel-patches/bbrv3/bbrv3.patch | patch -p1
 
-    - name: Apply Netfilter Base Config
+    - name: Apply IP Tables Extensions
       shell: bash
       working-directory: ${{ github.workspace }}/kernel
       run: |
         cat >> "${{ github.workspace }}/wild_gki.fragment" << 'EOF'
-        CONFIG_NETFILTER=y
-        CONFIG_NETFILTER_ADVANCED=y
-        CONFIG_NETFILTER_XTABLES=y
-        CONFIG_NF_CONNTRACK=y
         CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=y
-        CONFIG_NETFILTER_XT_TARGET_LOG=y
-        CONFIG_NETFILTER_XT_MATCH_RECENT=y
         CONFIG_NETFILTER_XT_SET=y
-        EOF
-
-    - name: Apply IP Tables Extensions
-      shell: bash
-      working-directory: ${{ github.workspace }}/kernel
-      run: |
-        cat >> "${{ github.workspace }}/wild_gki.fragment" << 'EOF'
-        CONFIG_IP_NF_TARGET_TTL=y
-        CONFIG_IP6_NF_TARGET_HL=y
-        CONFIG_IP6_NF_MATCH_HL=y
+        CONFIG_IP6_NF_NAT=y
+        CONFIG_IP6_NF_TARGET_MASQUERADE=y
         EOF
 
     - name: Apply IP Set Base
@@ -50,6 +36,7 @@ runs:
       run: |
         cat >> "${{ github.workspace }}/wild_gki.fragment" << 'EOF'
         CONFIG_IP_SET=y
+        CONFIG_IP_SET_MAX=65534
         CONFIG_IP_SET_BITMAP_IP=y
         CONFIG_IP_SET_BITMAP_IPMAC=y
         CONFIG_IP_SET_BITMAP_PORT=y
@@ -66,7 +53,10 @@ runs:
         CONFIG_IP_SET_HASH_NETPORT=y
         CONFIG_IP_SET_HASH_NETIFACE=y
         CONFIG_IP_SET_LIST_SET=y
-        CONFIG_IP_SET_MAX=256
+        CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=y
+        CONFIG_NETFILTER_XT_SET=y
+        CONFIG_IP6_NF_NAT=y
+        CONFIG_IP6_NF_TARGET_MASQUERADE=y
         EOF
 
     - name: Apply TCP Congestion Control
@@ -83,6 +73,7 @@ runs:
         CONFIG_DEFAULT_BBR=y
         CONFIG_DEFAULT_TCP_CONG="bbr"
         CONFIG_NET_SCH_FQ=y
+        CONFIG_NET_SCH_FQ_CODEL=y
         EOF
 
     - name: Apply Kernel Config for 5.10
@@ -90,5 +81,5 @@ runs:
       working-directory: ${{ github.workspace }}/kernel/common
       if: inputs.kernel_version == '5.10'
       run: |
-        sed -i 's/CONFIG_IP_SET_MAX/256/g' net/netfilter/ipset/ip_set_core.c
+        sed -i 's/CONFIG_IP_SET_MAX/65534/g' net/netfilter/ipset/ip_set_core.c
         

+ 4 - 4
.github/actions/prepare-anykernel3/action.yml

@@ -8,13 +8,13 @@ runs:
       run: |
         set -euo pipefail
 
-        if [ -f "$GITHUB_WORKSPACE/kernel/out/$ANDROID_VERSION-$KERNEL_VERSION/dist/Image" ]; then
-          cp "$GITHUB_WORKSPACE/kernel/out/$ANDROID_VERSION-$KERNEL_VERSION/dist/Image" "$GITHUB_WORKSPACE/AnyKernel3/Image"
+        if [ -f "${{ github.workspace }}/kernel/out/$ANDROID_VERSION-$KERNEL_VERSION/dist/Image" ]; then
+          cp "${{ github.workspace }}/kernel/out/$ANDROID_VERSION-$KERNEL_VERSION/dist/Image" "${{ github.workspace }}/AnyKernel3/Image"
           exit 0
         fi
 
-        if [ -f "$GITHUB_WORKSPACE/kernel/bazel-bin/common/kernel_aarch64/Image" ]; then
-          cp "$GITHUB_WORKSPACE/kernel/bazel-bin/common/kernel_aarch64/Image" "$GITHUB_WORKSPACE/AnyKernel3/Image"
+        if [ -f "${{ github.workspace }}/kernel/bazel-bin/common/kernel_aarch64/Image" ]; then
+          cp "${{ github.workspace }}/kernel/bazel-bin/common/kernel_aarch64/Image" "${{ github.workspace }}/AnyKernel3/Image"
           exit 0
         fi
 

+ 2 - 2
.github/actions/scan-patch-rejects/action.yml

@@ -12,8 +12,8 @@ runs:
       run: |
         set -euo pipefail
 
-        CONFIG_DIR="$GITHUB_WORKSPACE/kernel"
-        REJECTS_DIR="$GITHUB_WORKSPACE/patch-rejects"
+        CONFIG_DIR="${{ github.workspace }}/kernel"
+        REJECTS_DIR="${{ github.workspace }}/patch-rejects"
         mkdir -p "$REJECTS_DIR"
         mapfile -t REJS < <(find "$CONFIG_DIR" -type f -name '*.rej')
         REJ_COUNT=${#REJS[@]}

+ 15 - 15
.github/actions/setup-build-environment/action.yml

@@ -7,34 +7,34 @@ runs:
     - shell: bash
       run: |
         set -euo pipefail
-        mkdir -p "$GITHUB_WORKSPACE/kernel"
-        mkdir -p "$GITHUB_WORKSPACE/git-repo"
-        curl -L https://storage.googleapis.com/git-repo-downloads/repo -o "$GITHUB_WORKSPACE/git-repo/repo"
-        chmod +x "$GITHUB_WORKSPACE/git-repo/repo"
-        echo "$GITHUB_WORKSPACE/git-repo" >> "$GITHUB_PATH"
+        mkdir -p "${{ github.workspace }}/kernel"
+        mkdir -p "${{ github.workspace }}/git-repo"
+        curl -L https://storage.googleapis.com/git-repo-downloads/repo -o "${{ github.workspace }}/git-repo/repo"
+        chmod +x "${{ github.workspace }}/git-repo/repo"
+        echo "${{ github.workspace }}/git-repo" >> "$GITHUB_PATH"
 
-        if [ -d "$GITHUB_WORKSPACE/kernel_patches" ]; then rm -rf "$GITHUB_WORKSPACE/kernel_patches"; fi
-        git clone https://github.com/WildKernels/kernel_patches.git "$GITHUB_WORKSPACE/kernel_patches"
+        if [ -d "${{ github.workspace }}/kernel_patches" ]; then rm -rf "${{ github.workspace }}/kernel_patches"; fi
+        git clone https://github.com/WildKernels/kernel_patches.git "${{ github.workspace }}/kernel_patches"
 
-        if [ -d "$GITHUB_WORKSPACE/AnyKernel3" ]; then rm -rf "$GITHUB_WORKSPACE/AnyKernel3"; fi
-        git clone https://github.com/WildKernels/AnyKernel3.git -b gki-2.0 "$GITHUB_WORKSPACE/AnyKernel3"
+        if [ -d "${{ github.workspace }}/AnyKernel3" ]; then rm -rf "${{ github.workspace }}/AnyKernel3"; fi
+        git clone https://github.com/WildKernels/AnyKernel3.git -b gki-2.0 "${{ github.workspace }}/AnyKernel3"
 
         AOSP_MIRROR=https://android.googlesource.com
         BRANCH=main-kernel-2025
         git clone $AOSP_MIRROR/kernel/prebuilts/build-tools -b $BRANCH --depth 1 kernel-build-tools
         git clone $AOSP_MIRROR/platform/system/tools/mkbootimg -b $BRANCH --depth 1 mkbootimg
 
-        echo "AVBTOOL=$GITHUB_WORKSPACE/kernel-build-tools/linux-x86/bin/avbtool" >> "$GITHUB_ENV"
-        echo "MKBOOTIMG=$GITHUB_WORKSPACE/mkbootimg/mkbootimg.py" >> "$GITHUB_ENV"
-        echo "UNPACK_BOOTIMG=$GITHUB_WORKSPACE/mkbootimg/unpack_bootimg.py" >> "$GITHUB_ENV"
-        echo "BOOT_SIGN_KEY_PATH=$GITHUB_WORKSPACE/kernel-build-tools/linux-x86/share/avb/testkey_rsa2048.pem" >> "$GITHUB_ENV"
+        echo "AVBTOOL=${{ github.workspace }}/kernel-build-tools/linux-x86/bin/avbtool" >> "$GITHUB_ENV"
+        echo "MKBOOTIMG=${{ github.workspace }}/mkbootimg/mkbootimg.py" >> "$GITHUB_ENV"
+        echo "UNPACK_BOOTIMG=${{ github.workspace }}/mkbootimg/unpack_bootimg.py" >> "$GITHUB_ENV"
+        echo "BOOT_SIGN_KEY_PATH=${{ github.workspace }}/kernel-build-tools/linux-x86/share/avb/testkey_rsa2048.pem" >> "$GITHUB_ENV"
 
-        mkdir -p "$GITHUB_WORKSPACE/kernel-build-tools/linux-x86/share/avb"
+        mkdir -p "${{ github.workspace }}/kernel-build-tools/linux-x86/share/avb"
         if [ -z "${BOOT_SIGN_KEY:-}" ]; then
           exit 1
         fi
 
-        KEY_PATH="$GITHUB_WORKSPACE/kernel-build-tools/linux-x86/share/avb/testkey_rsa2048.pem"
+        KEY_PATH="${{ github.workspace }}/kernel-build-tools/linux-x86/share/avb/testkey_rsa2048.pem"
         printf '%s' "$BOOT_SIGN_KEY" > "$KEY_PATH"
         if ! head -n 1 "$KEY_PATH" | grep -q 'BEGIN'; then
           printf '%s' "$BOOT_SIGN_KEY" | base64 -d > "$KEY_PATH"

+ 3 - 3
.github/actions/susfs/action.yml

@@ -47,7 +47,7 @@ runs:
         if [ "${{ inputs.kernel_version }}" = "6.12" ]; then
           SUSFS_COMMIT="5c34dec2c3b69af1d72ac4a89b179741fc602a79"
         fi
-        cd $GITHUB_WORKSPACE/susfs4ksu
+        cd ${{ github.workspace }}/susfs4ksu
         git checkout "$SUSFS_COMMIT"
 
     - name: Enable KernelSU SUSFS Config
@@ -162,8 +162,8 @@ runs:
         #fi
         if [ "${{ inputs.sublevel }}" -le "58" ]; then
           echo "Applying task_mmu.c Android 15 6.6 Fake Patch"
-          sed -i "/int ret.*= 0, copied.*= 0;/a \\		unsigned int nr_subpages = __PAGE_SIZE / PAGE_SIZE;" fs/proc/task_mmu.c
-          sed -i "/unsigned int nr_subpages = __PAGE_SIZE \\/ PAGE_SIZE;/a \\		pagemap_entry_t *res = NULL;" fs/proc/task_mmu.c
+          sed -i "/int ret.*= 0, copied.*= 0;/a \\	unsigned int nr_subpages = __PAGE_SIZE / PAGE_SIZE;" fs/proc/task_mmu.c
+          sed -i "/unsigned int nr_subpages = __PAGE_SIZE \\/ PAGE_SIZE;/a \\	pagemap_entry_t *res = NULL;" fs/proc/task_mmu.c
         fi
         cat fs/proc/task_mmu.c
         if [ "${{ inputs.sublevel }}" -le "92" ]; then