Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions .github/scripts/automerge.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
TOPIC_BRANCH=$1
do_conf() {
# Define the filename
FILENAME="merge.conf"

# Create the file with the specified content
cat <<EOF > "$FILENAME"
baseline [email protected]:qualcomm-linux/kernel.git qcom-next
$TOPIC_BRANCH [email protected]:qualcomm-linux/kernel-topics.git $TOPIC_BRANCH
EOF

echo "File '$FILENAME' created successfully."
}

do_conf

cd kernel
../automerge/ci-merge -f ../merge.conf -t head -n
27 changes: 27 additions & 0 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
name: pre_merge
on:
pull_request:

jobs:
sync:
runs-on: self-hosted
steps:
- name: Clone repositories
run: |
git clone https://github.com/qualcomm-linux/kernel.git
git clone https://github.com/qualcomm-linux/automerge.git

- name: Create merge configuration
run: |
TOPIC_BRANCH=${GITHUB_REF#refs/heads/}
cat <<EOF > merge.conf
baseline [email protected]:qualcomm-linux/kernel.git qcom-next
$TOPIC_BRANCH [email protected]:qualcomm-linux/kernel-topics.git $TOPIC_BRANCH
EOF
echo "File 'merge.conf' created successfully."

- name: Run auto merge
run: |
cd kernel
../automerge/ci-merge -f ../merge.conf -t head -n

2 changes: 1 addition & 1 deletion README
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Linux kernel
Linux kernel topics
============

There are several guides for kernel developers and users. These guides can
Expand Down