diff --git a/.github/scripts/automerge.sh b/.github/scripts/automerge.sh new file mode 100644 index 0000000000000..0e2c79b9a2f47 --- /dev/null +++ b/.github/scripts/automerge.sh @@ -0,0 +1,18 @@ +TOPIC_BRANCH=$1 +do_conf() { + # Define the filename + FILENAME="merge.conf" + +# Create the file with the specified content +cat < "$FILENAME" +baseline git@github.com:qualcomm-linux/kernel.git qcom-next +$TOPIC_BRANCH git@github.com: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 diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml new file mode 100644 index 0000000000000..976518cab425c --- /dev/null +++ b/.github/workflows/pr.yml @@ -0,0 +1,23 @@ +name: pre_merge +on: + pull_request: + workflow_dispatch: + +jobs: + sync: + runs-on: self-hosted + steps: + - name: Create merge configuration + run: | + TOPIC_BRANCH=${{ github.base_ref }} + cat < merge.conf + baseline git@github.com:qualcomm-linux/kernel.git qcom-next + $TOPIC_BRANCH git@github.com: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 + diff --git a/README b/README index fd903645e6de0..bbe59b1eb85b0 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -Linux kernel +Linux kernel topics ============ There are several guides for kernel developers and users. These guides can