From 69636baefc56a5408dc4105246b42f45bb0ff239 Mon Sep 17 00:00:00 2001 From: sadilchamishka Date: Tue, 6 Feb 2024 17:10:13 +0530 Subject: [PATCH 1/2] Fix PR builder failure for kernel 4.10.x --- .github/scripts/pr-builder-7.sh | 4 ++-- .github/scripts/pr-builder.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/scripts/pr-builder-7.sh b/.github/scripts/pr-builder-7.sh index 5189a999ca2..11f22f87328 100644 --- a/.github/scripts/pr-builder-7.sh +++ b/.github/scripts/pr-builder-7.sh @@ -114,9 +114,9 @@ else cd $REPO if [ "$REPO" = "carbon-kernel" ]; then echo "" - echo "Checking out for 4.9.x branch..." + echo "Checking out for 4.10.x branch..." echo "==========================================================" - git checkout 4.9.x + git checkout 4.10.x elif [ "$REPO" = "carbon-deployment" ]; then echo "" echo "Checking out for 4.x.x branch in carbon-deployment..." diff --git a/.github/scripts/pr-builder.sh b/.github/scripts/pr-builder.sh index 4b74570a7c6..d3aea28a801 100644 --- a/.github/scripts/pr-builder.sh +++ b/.github/scripts/pr-builder.sh @@ -113,9 +113,9 @@ else cd $REPO if [ "$REPO" = "carbon-kernel" ]; then echo "" - echo "Checking out for 4.9.x branch..." + echo "Checking out for 4.10.x branch..." echo "==========================================================" - git checkout 4.9.x + git checkout 4.10.x elif [ "$REPO" = "carbon-deployment" ]; then echo "" echo "Checking out for 4.x.x branch in carbon-deployment..." From 2de359fcb812bdd6701c51fbd1382b2c4ae5dc7c Mon Sep 17 00:00:00 2001 From: sadilchamishka Date: Tue, 6 Feb 2024 17:31:29 +0530 Subject: [PATCH 2/2] Address review comments --- .github/scripts/pr-builder-7.sh | 2 +- .github/scripts/pr-builder.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/scripts/pr-builder-7.sh b/.github/scripts/pr-builder-7.sh index 11f22f87328..e86d98d96be 100644 --- a/.github/scripts/pr-builder-7.sh +++ b/.github/scripts/pr-builder-7.sh @@ -333,7 +333,7 @@ else echo "" KERNEL_DEPENDENCY_VERSION=$(echo $DEPENDENCY_VERSION | sed -e "s/-/./g") echo "Dependency version for carbon.product : $KERNEL_DEPENDENCY_VERSION" - sed -i "s/version=\"4.9.*\"/version=\"$KERNEL_DEPENDENCY_VERSION\"/g" modules/p2-profile-gen/carbon.product + sed -i "s/version=\"4.10.*\"/version=\"$KERNEL_DEPENDENCY_VERSION\"/g" modules/p2-profile-gen/carbon.product fi fi diff --git a/.github/scripts/pr-builder.sh b/.github/scripts/pr-builder.sh index d3aea28a801..c268a1e8856 100644 --- a/.github/scripts/pr-builder.sh +++ b/.github/scripts/pr-builder.sh @@ -353,7 +353,7 @@ else echo "" KERNEL_DEPENDENCY_VERSION=$(echo $DEPENDENCY_VERSION | sed -e "s/-/./g") echo "Dependency version for carbon.product : $KERNEL_DEPENDENCY_VERSION" - sed -i "s/version=\"4.9.*\"/version=\"$KERNEL_DEPENDENCY_VERSION\"/g" modules/p2-profile-gen/carbon.product + sed -i "s/version=\"4.10.*\"/version=\"$KERNEL_DEPENDENCY_VERSION\"/g" modules/p2-profile-gen/carbon.product fi fi