Просмотр исходного кода

ci: simplify artifact upload pattern and update kernel version formatting

Update the artifact upload pattern to be more generic and simplify the kernel version formatting in the build workflow. The changes ensure consistent version suffixing and remove redundant pattern matching.
TheWildJames 1 год назад
Родитель
Сommit
5c2dc18a10
2 измененных файлов с 4 добавлено и 4 удалено
  1. 3 3
      .github/workflows/build.yml
  2. 1 1
      .github/workflows/main.yml

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

@@ -303,11 +303,11 @@ jobs:
           
           #Set Kernel Name
           if [ "${{ inputs.kernel_version }}" = "6.6" ]; then
-            perl -0777 -pi -e 's/(echo "\$\{KERNELVERSION\}\$\{file_localversion\}\$\{config_localversion\}\$\{LOCALVERSION\}\$\{scm_version\}")(?!.*\1)/echo "\$\{KERNELVERSION\}-${{ inputs.android_version }}-🟢-Wild"/s' ./common/scripts/setlocalversion
+            perl -0777 -pi -e 's/(echo "\$\{KERNELVERSION\}\$\{file_localversion\}\$\{config_localversion\}\$\{LOCALVERSION\}\$\{scm_version\}")/echo "\$\{KERNELVERSION\}\$\{file_localversion\}\$\{config_localversion\}\$\{LOCALVERSION\}\$\{scm_version\}-🟢-Wild"/s' ./common/scripts/setlocalversion
           else
-            perl -0777 -pi -e 's/(echo "\$res")(?!.*\1)/echo "\-${{ inputs.android_version }}-🟢-Wild"/s' ./common/scripts/setlocalversion
+            perl -0777 -pi -e 's/(echo "\$res")/echo "\$res-🟢-Wild"/s' ./common/scripts/setlocalversion
           fi
-              
+
           #Set Kernel Timestamp
           perl -pi -e 's/build-timestamp = \$\(or \$\(KBUILD_BUILD_TIMESTAMP\), \$\(build-timestamp-auto\)\)/build-timestamp = "Sun Apr 20 04:20:00 UTC 2025"/' ./common/init/Makefile
               

+ 1 - 1
.github/workflows/main.yml

@@ -174,7 +174,7 @@ jobs:
 
       - name: Upload Release Assets
         run: |
-          for file in ./downloaded-artifacts/*-kernel-*/*; do
+          for file in ./downloaded-artifacts/*/*; do
             if [ -d "$file" ]; then
               continue
             fi