Merge pull request #7072 from Himangini/release-notes-for-158 #417
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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@3df4ab11eba7bda6032a0b82a6bb43b11571feac #v4.0.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"], | |
}); |