Skip to content

Commit

Permalink
Merge pull request #19412 from sadilchamishka/fix-pr-builder-for-kernel
Browse files Browse the repository at this point in the history
Fix PR builder failure for kernel 4.10.x
  • Loading branch information
sadilchamishka authored Feb 6, 2024
2 parents 55f6360 + 2de359f commit fe84786
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions .github/scripts/pr-builder-7.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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..."
Expand Down Expand Up @@ -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

Expand Down
6 changes: 3 additions & 3 deletions .github/scripts/pr-builder.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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..."
Expand Down Expand Up @@ -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

Expand Down

0 comments on commit fe84786

Please sign in to comment.