apr_11_slack_test_2 #22
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: Cherry-Pick Commits to Master (does not push anything to master) | |
| on: | |
| pull_request: | |
| branches: | |
| - production | |
| types: [closed] | |
| jobs: | |
| cherry-pick: | |
| runs-on: ubuntu-latest | |
| if: | | |
| github.event.pull_request.merged == true && | |
| github.event.pull_request.head.ref != 'master' && | |
| github.event.pull_request.base.ref == 'production' | |
| steps: | |
| - name: Checkout master code | |
| uses: actions/checkout@v2 | |
| with: | |
| ref: 'master' | |
| - name: Fetch latest production changes | |
| run: git fetch origin production:production | |
| - name: Create cherry-pick branch | |
| run: | | |
| git checkout -b cherry-pick-${{ github.run_id }} | |
| env: | |
| GITHUB_TOKEN: ${{ secrets.CP_TEST_PAT }} | |
| - name: Push cherry-pick branch | |
| id: create-branch | |
| run: | | |
| git push -u origin cherry-pick-${{ github.run_id }} | |
| env: | |
| GITHUB_TOKEN: ${{ secrets.CP_TEST_PAT }} | |
| - name: Checkout master branch | |
| uses: actions/checkout@v2 | |
| with: | |
| ref: master | |
| - name: Checkout cherry-pick branch | |
| uses: actions/checkout@v2 | |
| with: | |
| ref: cherry-pick-${{ github.run_id }} | |
| - name: Cherry-pick and push production commit | |
| id: cherry-pick | |
| run: | | |
| git config user.email "${GITHUB_ACTOR}@users.noreply.github.com" | |
| git config user.name "${GITHUB_ACTOR}" | |
| if git cherry-pick ${{ github.event.pull_request.merge_commit_sha }}; then | |
| if git push -u origin cherry-pick-${{ github.run_id }}; then | |
| echo "::set-output name=result::push-success" | |
| else | |
| echo "::set-output name=result::push-failure" | |
| fi | |
| else | |
| echo "::set-output name=result::cherry-pick-failure" | |
| fi | |
| env: | |
| GITHUB_TOKEN: ${{ secrets.CP_TEST_PAT }} | |
| continue-on-error: true | |
| - name: Create Pull Request new branch to master | |
| id: create_pr | |
| if: steps.cherry-pick.outputs.result == 'push-success' | |
| run: | | |
| PR_URL=$(gh pr create --title "Cherry-pick PR #${{ github.event.pull_request.number }} to master" \ | |
| --body "Automatically cherry-picked from production to master. Original PR: #${{ github.event.pull_request.number }}" \ | |
| --base master \ | |
| --head cherry-pick-${{ github.run_id }} \ | |
| --repo ${{ github.repository }}) | |
| echo "::set-output name=pr_link::$PR_URL" | |
| env: | |
| GITHUB_TOKEN: ${{ secrets.CP_TEST_PAT }} | |
| - name: Send Slack Notification on success | |
| if: steps.cherry-pick.outputs.result == 'push-success' | |
| uses: slackapi/[email protected] | |
| with: | |
| channel-id: 'C06L9MGA231' #r113-deployment-discussion | |
| slack-message: | | |
| Cherry-pick succeeded :tada: | |
| *For PR:* ${{ github.event.pull_request.title }} ${{ github.event.pull_request.html_url }} | |
| *Creator:* ${{ github.event.pull_request.user.login }} | |
| *Merged by:* ${{ github.event.pull_request.merged_by.login }} | |
| *Auto cherry-pick PR:* ${{ steps.create_pr.outputs.pr_link }} | |
| To complete cherry-pick to master, simply get approval for above PR and merge to master | |
| *Workflow Link:* https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }} | |
| <@U03DPUY7TT4> | |
| env: | |
| SLACK_BOT_TOKEN: ${{ secrets.SLACK_TOKEN }} | |
| - name: Send Slack Notification on failure | |
| if: (steps.cherry-pick.outputs.result == 'cherry-pick-failure') || (steps.cherry-pick.outputs.result == 'push-failure') | |
| uses: slackapi/[email protected] | |
| with: | |
| channel-id: 'C06L9MGA231' #r113-deployment-discussion | |
| slack-message: | | |
| Cherry-pick failed :x: | |
| *For PR:* ${{ github.event.pull_request.title }} ${{ github.event.pull_request.html_url }} | |
| *Creator:* ${{ github.event.pull_request.user.login }} | |
| *Merged by:* ${{ github.event.pull_request.merged_by.login }} | |
| *Could not auto create cherry-pick PR* | |
| *Workflow Link:* https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }} | |
| *How to Resolve:* | |
| Follow https://netskope.atlassian.net/wiki/spaces/DO/pages/3901161500/Branching+Strategy+Guidelines+-+Deployments+Repo#Syncing-Production-to-Master-guide | |
| <@U03DPUY7TT4> | |
| env: | |
| SLACK_BOT_TOKEN: ${{ secrets.SLACK_TOKEN }} | |