Bladeren bron

fix: simplify kernel branding configuration and streamline image path in build action

TheWildJames 3 maanden geleden
bovenliggende
commit
e06396ae49
2 gewijzigde bestanden met toevoegingen van 6 en 10 verwijderingen
  1. 1 7
      .github/actions/apply-kernel-branding/action.yml
  2. 5 3
      .github/actions/build-kernel/action.yml

+ 1 - 7
.github/actions/apply-kernel-branding/action.yml

@@ -62,13 +62,7 @@ runs:
 
         DEFCONFIG="${{ github.workspace }}/kernel/common/arch/arm64/configs/gki_defconfig"
         
-        if grep -q '^CONFIG_LOCALVERSION=' "$DEFCONFIG"; then
-          LOCALVERSION_VALUE="$(grep -m1 '^CONFIG_LOCALVERSION=' "$DEFCONFIG" | sed -E 's/^CONFIG_LOCALVERSION="?([^"]*)"?$/\1/')"
-          echo "CONFIG_LOCALVERSION=\"${LOCALVERSION_VALUE}-Wild\"" >> "$CONFIG_FRAGMENT"
-        else
-          echo 'CONFIG_LOCALVERSION="-Wild"' >> "$CONFIG_FRAGMENT"
-        fi
         cat >> "${{ github.workspace }}/wild_gki.fragment" << 'EOF'
-        CONFIG_LOCALVERSION=""
+        CONFIG_LOCALVERSION="-Wild"
         # CONFIG_LOCALVERSION_AUTO is not set
         EOF

+ 5 - 3
.github/actions/build-kernel/action.yml

@@ -94,15 +94,17 @@ runs:
     working-directory: ${{ github.workspace }}
     run: |
       set -euo pipefail
-      if [ -f "/home/runner/out/${{ inputs.version }}/dist/Image" ]; then
+      if [ -f "/home/runner/out/dist/Image" ]; then
+        echo "Found Image at /home/runner/out/dist/Image"
         if [[ ${{ inputs.bypass }} == "true" ]]; then
-          cp "/home/runner/out/${{ inputs.version }}/dist/Image" "${{ github.workspace }}/AnyKernel3/Bypass-Image"
+          cp "/home/runner/out/dist/Image" "${{ github.workspace }}/AnyKernel3/Bypass-Image"
         else
-          cp "/home/runner/out/${{ inputs.version }}/dist/Image" "${{ github.workspace }}/AnyKernel3/Image"
+          cp "/home/runner/out/dist/Image" "${{ github.workspace }}/AnyKernel3/Image"
         fi
           exit 0
         fi
       if [ -f "/home/runner/out/Image" ]; then
+        echo "Found Image at /home/runner/out/Image"
         if [[ ${{ inputs.bypass }} == "true" ]]; then
           cp "/home/runner/out/Image" "${{ github.workspace }}/AnyKernel3/Bypass-Image"
         else