Kaynağa Gözat

feat(workflows): update kernel testing and notification workflows with new variants and artifact handling

TheWildJames 7 ay önce
ebeveyn
işleme
3f1995e820

+ 4 - 26
.github/workflows/build.yml

@@ -43,10 +43,9 @@ jobs:
           ${{
             fromJSON(
               inputs.variant == 'vTomsonek' && '["vTomsonek"]' ||
-              inputs.variant == 'TheWildJamesTest' && '["TheWildJamesTest"]' ||
+              inputs.variant == 'TheWildJames' && '["TheWildJames"]' ||
               inputs.variant == 'MarionKernel' && '["MarionKernel"]' ||
               inputs.variant == 'Hakan' && '["Hakan"]' ||
-              inputs.variant == 'Duchamp' && '["Duchamp"]' ||
               inputs.variant == 'Neyugn' && '["Neyugn"]' ||
               (inputs.build_bypass && '["Normal","Bypass"]' || '["Normal"]')
             )
@@ -84,26 +83,6 @@ jobs:
         rmz_version: "3.1.1"  # Required when rm_cmd is 'rmz'
         testing: false
 
-    - name: Install System Dependencies
-      if: false
-      run: |
-        set -e
-        sudo apt-get update
-        sudo DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
-          binutils \
-          binutils-x86-64-linux-gnu \
-          lld
-
-        if ! command -v ld >/dev/null 2>&1 && command -v x86_64-linux-gnu-ld >/dev/null 2>&1; then
-          sudo ln -sf "$(command -v x86_64-linux-gnu-ld)" /usr/bin/ld
-        fi
-
-        command -v ld
-        ld --version | head -n 1
-        echo "PATH=/usr/bin:/bin:$PATH" >> "$GITHUB_ENV"
-        echo "HOSTLDFLAGS=-B/usr/bin ${HOSTLDFLAGS:-}" >> "$GITHUB_ENV"
-        echo "LDFLAGS=-B/usr/bin ${LDFLAGS:-}" >> "$GITHUB_ENV"
-
     - name: Setup Build Environment
       run: |
         CONFIG="${{ inputs.android_version }}-${{ inputs.kernel_version }}-${{ inputs.sub_level }}"
@@ -130,7 +109,6 @@ jobs:
       run: |
         ANYKERNEL_BRANCH="gki-2.0"
         git clone https://github.com/WildKernels/AnyKernel3.git -b "$ANYKERNEL_BRANCH"
-        rm -rf AnyKernel3/.git
         git clone https://github.com/WildKernels/kernel_patches.git
 
     - name: Initialize and Sync Kernel Source
@@ -138,7 +116,9 @@ jobs:
       run: |
         FORMATTED_BRANCH="${{ inputs.android_version }}-${{ inputs.kernel_version }}-${{ inputs.os_patch_level }}"
 
-        repo init -u https://android.googlesource.com/kernel/manifest -b common-${FORMATTED_BRANCH} --repo-rev=v2.16 --depth=1
+        repo init -u https://android.googlesource.com/kernel/manifest -b common-${FORMATTED_BRANCH} --depth=1
+
+        #--repo-rev=v2.16
 
         REMOTE_BRANCH=$(git ls-remote https://android.googlesource.com/kernel/common ${FORMATTED_BRANCH})
         DEFAULT_MANIFEST_PATH=.repo/manifests/default.xml
@@ -216,8 +196,6 @@ jobs:
         git clone https://gitlab.com/simonpunk/susfs4ksu.git -b "$SUSFS_BRANCH"
 
         SUSFS_VERSION="2.0.0"
-        cd "$KERNEL_ROOT/Wild_KSU"
-        echo "Nothing to fix for WKSU"
 
         cd "$KERNEL_ROOT/common"
         cp "$SUSFS4KSU/kernel_patches/fs/"* "$KERNEL_ROOT/common/fs/"

+ 5 - 0
.github/workflows/kernel-testing.yml

@@ -29,6 +29,11 @@ jobs:
             sub_level: "145"
             os_patch_level: "2025-09"
             variant: "TheWildJames"
+          - android_version: "android14"
+            kernel_version: "6.1"
+            sub_level: "145"
+            os_patch_level: "2025-08"
+            variant: "TheWildJames2"
 
     uses: ./.github/workflows/build.yml
     secrets: inherit

+ 3 - 30
.github/workflows/notify.yml

@@ -47,39 +47,12 @@ jobs:
         rmz_version: "3.1.1"
         testing: false
 
-      # Download all artifacts that match the pattern *-AnyKernel3
-      # This replaces the hardcoded steps in the original file with a more generic one
-    - name: Download All Artifacts
+      # Download only TheWildJames artifacts for Telegram notification
+    - name: Download TheWildJames Artifacts
       uses: actions/download-artifact@v4
       with:
         path: ./downloaded-artifacts
-        pattern: "*-AnyKernel3"
-        merge-multiple: true
-
-    - name: Zip Artifacts
-      run: |
-        shopt -s nullglob
-        # The download-artifact v4 with merge-multiple puts everything in the path.
-        # However, the structure from the build job might be: artifact_name/files
-        # Let's adjust based on how build.yml uploads them.
-        # build.yml uses upload-artifact@v4 with name: "..." and path: "..."
-        
-        # If we downloaded multiple artifacts, they might be mixed if we use merge-multiple.
-        # Let's check the structure.
-        # Actually, let's stick to the previous logic but make it dynamic.
-        # Since we don't know exact names, we download all individually?
-        # actions/download-artifact@v5 (v4 actually) supports patterns.
-        
-        mkdir -p zip_staging
-        
-        # We need to zip each artifact folder back into a zip file
-        # But download-artifact v4 merges if we use pattern * without separate folders unless we specify.
-        
-    - name: Download Artifacts (Separate Folders)
-      uses: actions/download-artifact@v4
-      with:
-        path: ./downloaded-artifacts
-        pattern: "*-AnyKernel3"
+        pattern: "*-TheWildJames-AnyKernel3"
         
     - name: Prepare Zips
       run: |