Skip to content

Merge pull request #7113 from Himangini/release-notes-for-160 #419

Merge pull request #7113 from Himangini/release-notes-for-160

Merge pull request #7113 from Himangini/release-notes-for-160 #419

name: Merge release changes to main
on:
push:
branches:
- "release-[0-9]+.[0-9]+"
env:
VERSION_FILE: pkg/version/release.go
DEFAULT_BRANCH: main
jobs:
merge_release:
name: Merge release
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 #v4.1.0
with:
fetch-depth: 0
- name: Setup identity as eksctl-bot
uses: ./.github/actions/setup-identity
with:
token: "${{ secrets.GITHUB_TOKEN }}"
- name: Merge release branch into ${{env.DEFAULT_BRANCH}}
id: merge-changes
run: |
git checkout $DEFAULT_BRANCH
git checkout -b merge-${{ github.sha }}
if [ "$(git merge --no-commit --no-ff ${{ github.ref }})" = "Already up to date." ]; then
exit 0;
fi
git checkout ORIG_HEAD -- $VERSION_FILE
git add $VERSION_FILE
EDITOR=true git merge --continue
! git diff --exit-code $DEFAULT_BRANCH...HEAD || exit 1
git push --set-upstream origin HEAD
echo "changes=true" >> $GITHUB_OUTPUT
- uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410 #v6.4.1
name: Open PR to ${{env.DEFAULT_BRANCH}}
if: steps.merge-changes.outputs.changes == 'true'
with:
github-token: ${{ secrets.EKSCTLBOT_TOKEN }}
script: |
const { data: pr } = await github.pulls.create({
...context.repo,
title: `Merge ${context.ref} to ${{ env.DEFAULT_BRANCH }}`,
head: `merge-${context.sha}`,
base: "${{ env.DEFAULT_BRANCH }}",
});
await github.issues.addLabels({
...context.repo,
issue_number: pr.number,
labels: ["skip-release-notes"],
});