mirror of
https://github.com/kernelkit/infix.git
synced 2026-07-22 01:13:00 +02:00
Automate kernel updates to new minor version
This will fix #1106, in time, but only allows manual trigger for now, needs more test and verification utils/kernel-upgrade.sh at least automate all the manual manual processes for upgrading the kernel.
This commit is contained in:
Mattias Walström
@@ -0,0 +1,112 @@
|
||||
name: Check Kernel 6.12 Release
|
||||
|
||||
on:
|
||||
workflow_dispatch: # Allow manual triggering
|
||||
|
||||
jobs:
|
||||
check-kernel:
|
||||
runs-on: ubuntu-latest
|
||||
|
||||
steps:
|
||||
- name: Check out infix repository
|
||||
uses: actions/checkout@v4
|
||||
with:
|
||||
fetch-depth: 0
|
||||
token: ${{ secrets.KERNEL_UPDATE_TOKEN }}
|
||||
|
||||
- name: Check out linux repository
|
||||
uses: actions/checkout@v4
|
||||
with:
|
||||
repository: kernelkit/linux
|
||||
path: linux
|
||||
fetch-depth: 0
|
||||
token: ${{ secrets.KERNEL_UPDATE_TOKEN }}
|
||||
|
||||
- name: Fetch kernel.org and check for 6.12 release
|
||||
id: check
|
||||
run: |
|
||||
# Fetch the kernel.org frontpage and extract 6.12 version
|
||||
CURRENT_VERSION=$(curl -s https://www.kernel.org/ | grep -oP '6\.12\.\d+' | head -n1)
|
||||
|
||||
if [ -z "$CURRENT_VERSION" ]; then
|
||||
echo "Failed to fetch kernel version"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo "current_version=$CURRENT_VERSION" >> $GITHUB_OUTPUT
|
||||
echo "Current 6.12 kernel version: $CURRENT_VERSION"
|
||||
|
||||
# Get the latest tag from our linux tree
|
||||
cd linux
|
||||
git fetch origin
|
||||
LATEST_TAG=$(git tag -l "v6.12.*" | sort -V | tail -n1 | sed 's/^v//')
|
||||
cd ..
|
||||
|
||||
echo "latest_tag=$LATEST_TAG" >> $GITHUB_OUTPUT
|
||||
echo "Latest tag in our tree: $LATEST_TAG"
|
||||
|
||||
if [ "$CURRENT_VERSION" != "$LATEST_TAG" ]; then
|
||||
echo "new_release=true" >> $GITHUB_OUTPUT
|
||||
echo "🎉 New 6.12 kernel released: $CURRENT_VERSION (our version: $LATEST_TAG)"
|
||||
else
|
||||
echo "new_release=false" >> $GITHUB_OUTPUT
|
||||
echo "No change - still at $CURRENT_VERSION"
|
||||
fi
|
||||
|
||||
- name: Set up git credentials
|
||||
if: steps.check.outputs.new_release == 'true'
|
||||
run: |
|
||||
git config --global user.email "ael-bot@users.noreply.github.com"
|
||||
git config --global user.name "ael-bot"
|
||||
|
||||
# Configure git to use the token for HTTPS operations
|
||||
git config --global url."https://ael-bot:${{ secrets.KERNEL_UPDATE_TOKEN }}@github.com/".insteadOf "git@github.com:"
|
||||
git config --global url."https://ael-bot:${{ secrets.KERNEL_UPDATE_TOKEN }}@github.com/".insteadOf "https://github.com/"
|
||||
|
||||
- name: Run kernel upgrade script
|
||||
if: steps.check.outputs.new_release == 'true'
|
||||
env:
|
||||
GIT_TERMINAL_PROMPT: 0
|
||||
run: |
|
||||
./utils/kernel-upgrade.sh linux
|
||||
|
||||
- name: Create pull request
|
||||
if: steps.check.outputs.new_release == 'true'
|
||||
uses: actions/github-script@v7
|
||||
with:
|
||||
github-token: ${{ secrets.KERNEL_UPDATE_TOKEN }}
|
||||
script: |
|
||||
// Check if PR already exists
|
||||
const { data: pulls } = await github.rest.pulls.list({
|
||||
owner: context.repo.owner,
|
||||
repo: context.repo.repo,
|
||||
head: `${context.repo.owner}:kernel-upgrade`,
|
||||
state: 'open'
|
||||
});
|
||||
|
||||
if (pulls.length === 0) {
|
||||
const { data: pr } = await github.rest.pulls.create({
|
||||
owner: context.repo.owner,
|
||||
repo: context.repo.repo,
|
||||
title: `Upgrade to kernel ${{ steps.check.outputs.current_version }}`,
|
||||
head: 'kernel-upgrade',
|
||||
base: 'main',
|
||||
body: `Automated kernel upgrade to version ${{ steps.check.outputs.current_version }}.\n\n**Previous version:** ${{ steps.check.outputs.latest_tag }}\n**New version:** ${{ steps.check.outputs.current_version }}\n**Source:** https://www.kernel.org/\n\nThis PR was automatically created by the kernel release monitoring workflow.`
|
||||
});
|
||||
|
||||
// Add label
|
||||
await github.rest.issues.addLabels({
|
||||
owner: context.repo.owner,
|
||||
repo: context.repo.repo,
|
||||
issue_number: pr.number,
|
||||
labels: ['ci:main']
|
||||
});
|
||||
|
||||
// Request reviews
|
||||
await github.rest.pulls.requestReviewers({
|
||||
owner: context.repo.owner,
|
||||
repo: context.repo.repo,
|
||||
pull_number: pr.number,
|
||||
reviewers: ['troglobit', 'wkz', 'mattiaswal']
|
||||
});
|
||||
}
|
||||
Executable
+273
@@ -0,0 +1,273 @@
|
||||
#!/bin/bash
|
||||
#
|
||||
# Automated kernel upgrade test script for LTS 6.12.x
|
||||
# Run from the infix directory and specify the path to the linux kernel tree
|
||||
#
|
||||
# Usage: ./utils/kernel-upgrade.sh <path-to-linux-dir>
|
||||
#
|
||||
|
||||
set -e
|
||||
|
||||
# Parse arguments
|
||||
if [ $# -ne 1 ]; then
|
||||
echo "Usage: $0 <path-to-linux-dir>"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
LINUX_DIR="$1"
|
||||
|
||||
# Configuration
|
||||
INFIX_DIR="$(dirname "$(dirname "$(readlink -f "$0")")")"
|
||||
INFIX_BRANCH="kernel-upgrade"
|
||||
LINUX_BRANCH="kkit-linux-6.12.y"
|
||||
UPSTREAM_REMOTE="upstream"
|
||||
UPSTREAM_URL="https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git"
|
||||
KKIT_REMOTE="origin"
|
||||
KKIT_URL="git@github.com:kernelkit/linux.git"
|
||||
KERNEL_VERSION_PATTERN="6.12"
|
||||
|
||||
# Colors for output
|
||||
RED='\033[0;31m'
|
||||
GREEN='\033[0;32m'
|
||||
YELLOW='\033[1;33m'
|
||||
NC='\033[0m' # No Color
|
||||
|
||||
log_info() {
|
||||
echo -e "${GREEN}[INFO]${NC} $1"
|
||||
}
|
||||
|
||||
log_warn() {
|
||||
echo -e "${YELLOW}[WARN]${NC} $1"
|
||||
}
|
||||
|
||||
log_error() {
|
||||
echo -e "${RED}[ERROR]${NC} $1"
|
||||
}
|
||||
|
||||
# Check if directories exist
|
||||
check_directories() {
|
||||
log_info "Checking directories..."
|
||||
|
||||
if [ ! -d "$LINUX_DIR" ]; then
|
||||
log_info "Linux directory '$LINUX_DIR' not found, cloning..."
|
||||
if git clone "$KKIT_URL" "$LINUX_DIR"; then
|
||||
log_info "Successfully cloned linux repository"
|
||||
else
|
||||
log_error "Failed to clone linux repository"
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ ! -d "$INFIX_DIR" ]; then
|
||||
log_error "Infix directory '$INFIX_DIR' not found"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [ ! -f "$INFIX_DIR/utils/kernel-refresh.sh" ]; then
|
||||
log_error "Kernel refresh script not found at $INFIX_DIR/utils/kernel-refresh.sh"
|
||||
exit 1
|
||||
fi
|
||||
}
|
||||
|
||||
# Setup remotes for linux kernel tree
|
||||
setup_linux_remotes() {
|
||||
log_info "Setting up linux kernel remotes..."
|
||||
|
||||
# Add or update upstream remote (kernel.org via HTTPS)
|
||||
if git -C "$LINUX_DIR" remote get-url "$UPSTREAM_REMOTE" &>/dev/null; then
|
||||
log_info "Updating $UPSTREAM_REMOTE remote URL"
|
||||
git -C "$LINUX_DIR" remote set-url "$UPSTREAM_REMOTE" "$UPSTREAM_URL"
|
||||
else
|
||||
log_info "Adding $UPSTREAM_REMOTE remote"
|
||||
git -C "$LINUX_DIR" remote add "$UPSTREAM_REMOTE" "$UPSTREAM_URL"
|
||||
fi
|
||||
|
||||
# Add or update kkit remote (github via SSH)
|
||||
if git -C "$LINUX_DIR" remote get-url "$KKIT_REMOTE" &>/dev/null; then
|
||||
log_info "Updating $KKIT_REMOTE remote URL"
|
||||
git -C "$LINUX_DIR" remote set-url "$KKIT_REMOTE" "$KKIT_URL"
|
||||
else
|
||||
log_info "Adding $KKIT_REMOTE remote"
|
||||
git -C "$LINUX_DIR" remote add "$KKIT_REMOTE" "$KKIT_URL"
|
||||
fi
|
||||
}
|
||||
|
||||
# Update linux kernel tree
|
||||
update_linux_kernel() {
|
||||
log_info "Processing linux kernel tree..."
|
||||
|
||||
# Ensure we're on the correct branch
|
||||
log_info "Checking out branch $LINUX_BRANCH"
|
||||
git -C "$LINUX_DIR" checkout "$LINUX_BRANCH"
|
||||
|
||||
# Get current version before update
|
||||
CURRENT_VERSION=$(git -C "$LINUX_DIR" describe --tags 2>/dev/null || echo "unknown")
|
||||
log_info "Current version: $CURRENT_VERSION"
|
||||
|
||||
# Fetch from upstream (kernel.org)
|
||||
log_info "Fetching latest kernel updates from upstream..."
|
||||
git -C "$LINUX_DIR" fetch "$UPSTREAM_REMOTE"
|
||||
|
||||
# Fetch from kkit remote
|
||||
log_info "Fetching from kkit remote..."
|
||||
git -C "$LINUX_DIR" fetch "$KKIT_REMOTE"
|
||||
|
||||
# Pull changes from kkit remote
|
||||
log_info "Pulling latest changes from $KKIT_REMOTE..."
|
||||
git -C "$LINUX_DIR" pull "$KKIT_REMOTE" "$LINUX_BRANCH"
|
||||
}
|
||||
|
||||
# Rebase on new kernel
|
||||
rebase_kernel() {
|
||||
log_info "Rebasing on new kernel release..."
|
||||
|
||||
# Find the latest v6.12.x tag from upstream
|
||||
LATEST_TAG=$(git -C "$LINUX_DIR" tag -l "v${KERNEL_VERSION_PATTERN}.*" | sort -V | tail -n1)
|
||||
|
||||
if [ -z "$LATEST_TAG" ]; then
|
||||
log_error "No tags found matching v${KERNEL_VERSION_PATTERN}.*"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
log_info "Latest kernel tag: $LATEST_TAG"
|
||||
log_info "Rebasing $LINUX_BRANCH on $LATEST_TAG..."
|
||||
|
||||
if git -C "$LINUX_DIR" rebase "$LATEST_TAG"; then
|
||||
log_info "Rebase successful"
|
||||
else
|
||||
log_error "Rebase failed. Manual intervention required."
|
||||
log_info "Run 'git rebase --abort' to cancel or resolve conflicts manually"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Push rebased branch to kkit remote
|
||||
log_info "Pushing rebased branch to $KKIT_REMOTE..."
|
||||
if git -C "$LINUX_DIR" push "$KKIT_REMOTE" "$LINUX_BRANCH" --force-with-lease; then
|
||||
log_info "Successfully pushed to $KKIT_REMOTE"
|
||||
else
|
||||
log_error "Push failed"
|
||||
exit 1
|
||||
fi
|
||||
}
|
||||
|
||||
# Update infix and run kernel refresh
|
||||
update_infix() {
|
||||
log_info "Processing infix tree..."
|
||||
|
||||
# Fetch latest changes
|
||||
log_info "Fetching latest changes..."
|
||||
git fetch origin
|
||||
|
||||
# Update main branch
|
||||
log_info "Updating main branch..."
|
||||
git checkout main
|
||||
git pull origin main
|
||||
|
||||
# Check if branch exists and remove it
|
||||
if git show-ref --verify --quiet "refs/heads/$INFIX_BRANCH"; then
|
||||
log_info "Branch $INFIX_BRANCH exists, removing it..."
|
||||
git branch -D "$INFIX_BRANCH"
|
||||
fi
|
||||
|
||||
# Create fresh branch from main
|
||||
log_info "Creating fresh $INFIX_BRANCH from main..."
|
||||
git checkout -b "$INFIX_BRANCH"
|
||||
|
||||
# Get old kernel version from defconfig
|
||||
OLD_VERSION=$(grep 'BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE=' configs/aarch64_defconfig | cut -d'"' -f2)
|
||||
|
||||
if [ -z "$OLD_VERSION" ]; then
|
||||
log_error "Could not determine old kernel version from configs/aarch64_defconfig"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
log_info "Old kernel version: $OLD_VERSION"
|
||||
|
||||
# Get new kernel version from linux tree
|
||||
NEW_VERSION=$(cd "$LINUX_DIR" && git describe --tags --abbrev=0 2>/dev/null | sed 's/^v//')
|
||||
|
||||
if [ -z "$NEW_VERSION" ]; then
|
||||
log_error "Could not determine new kernel version"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
log_info "New kernel version: $NEW_VERSION"
|
||||
|
||||
# Check if versions are the same
|
||||
if [ "$OLD_VERSION" = "$NEW_VERSION" ]; then
|
||||
log_info "Kernel version unchanged ($OLD_VERSION), skipping refresh"
|
||||
return 0
|
||||
fi
|
||||
|
||||
# Run kernel refresh script
|
||||
KERNEL_PATH="$(cd "$LINUX_DIR" && pwd)"
|
||||
PATCH_DIR="$INFIX_DIR/patches/linux/$NEW_VERSION"
|
||||
DEFCONFIG_DIR="$INFIX_DIR/configs"
|
||||
|
||||
log_info "bash utils/kernel-refresh.sh -k \"$KERNEL_PATH\" -o \"$OLD_VERSION\" -t \"v$NEW_VERSION\" -p \"$PATCH_DIR\" -d \"$DEFCONFIG_DIR\""
|
||||
log_info "Running kernel refresh script..."
|
||||
if bash utils/kernel-refresh.sh -k "$KERNEL_PATH" -o "$OLD_VERSION" -t "v$NEW_VERSION" -p "$PATCH_DIR" -d "$DEFCONFIG_DIR"; then
|
||||
log_info "Kernel refresh completed successfully"
|
||||
else
|
||||
log_error "Kernel refresh failed"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Update ChangeLog.md with new kernel version
|
||||
log_info "Updating ChangeLog.md..."
|
||||
if [ -f "doc/ChangeLog.md" ]; then
|
||||
# Check if there's already a kernel upgrade entry in the latest release
|
||||
if grep -q "^- Upgrade Linux kernel to" doc/ChangeLog.md | head -20; then
|
||||
# Find and update the existing kernel upgrade line
|
||||
sed -i "0,/^- Upgrade Linux kernel to.*/{s/^- Upgrade Linux kernel to.*/- Upgrade Linux kernel to $NEW_VERSION (LTS)/}" doc/ChangeLog.md
|
||||
log_info "Updated existing kernel version entry to $NEW_VERSION"
|
||||
else
|
||||
# Add new kernel upgrade entry after the first "### Changes" section
|
||||
sed -i "0,/^### Changes/a\\
|
||||
\\
|
||||
- Upgrade Linux kernel to $NEW_VERSION (LTS)" doc/ChangeLog.md
|
||||
log_info "Added new kernel version entry: $NEW_VERSION"
|
||||
fi
|
||||
else
|
||||
log_warn "doc/ChangeLog.md not found, skipping changelog update"
|
||||
fi
|
||||
}
|
||||
|
||||
# Check for uncommitted changes
|
||||
check_clean_working_tree() {
|
||||
log_info "Checking for uncommitted changes..."
|
||||
|
||||
# Check infix directory
|
||||
if ! git -C "$INFIX_DIR" diff-index --quiet HEAD --; then
|
||||
log_error "Infix directory has uncommitted changes. Please commit or stash them first."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Check linux directory if it exists
|
||||
if [ -d "$LINUX_DIR" ]; then
|
||||
if ! git -C "$LINUX_DIR" diff-index --quiet HEAD --; then
|
||||
log_error "Linux directory has uncommitted changes. Please commit or stash them first."
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
|
||||
log_info "Working tree is clean"
|
||||
}
|
||||
|
||||
# Main execution
|
||||
main() {
|
||||
log_info "Starting automated kernel upgrade test..."
|
||||
log_info "Working directory: $(pwd)"
|
||||
|
||||
check_clean_working_tree
|
||||
check_directories
|
||||
setup_linux_remotes
|
||||
update_linux_kernel
|
||||
rebase_kernel
|
||||
update_infix
|
||||
|
||||
log_info "Kernel upgrade completed successfully!"
|
||||
}
|
||||
|
||||
# Run main function
|
||||
main
|
||||
Reference in New Issue
Block a user