Procházet zdrojové kódy

fix(action): uncomment SKIP_MRPROPER in build script for clarity; update reject scan condition to check variant

TheWildJames před 4 měsíci
rodič
revize
dec5b7db85

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

@@ -9,7 +9,8 @@ runs:
       run: |
         set -euo pipefail
         if [ -f "build/build.sh" ]; then
-          SKIP_MRPROPER=1 GKI_DEFCONFIG_FRAGMENT="$GITHUB_WORKSPACE/wild_gki.fragment" BUILD_CONFIG=common/build.config.gki.aarch64 build/build.sh
+          #SKIP_MRPROPER=1 
+          GKI_DEFCONFIG_FRAGMENT="$GITHUB_WORKSPACE/wild_gki.fragment" BUILD_CONFIG=common/build.config.gki.aarch64 build/build.sh
         else
           cp "$GITHUB_WORKSPACE/wild_gki.fragment" common/arch/arm64/configs/wild_gki.fragment
           tools/bazel build --config=release --stamp --notrim --defconfig_fragment=//common:arch/arm64/configs/wild_gki.fragment //common:kernel_aarch64_dist

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

@@ -178,7 +178,7 @@ jobs:
 
     - name: Scan and collect patch rejects
       id: scan
-      if: ${{ always() }}
+      if: ${{ always() && matrix.variant == 'Normal' }}
       uses: ./.github/actions/scan-patch-rejects
 
     - name: Upload Rejects