generated from skills/resolve-merge-conflicts
-
Notifications
You must be signed in to change notification settings - Fork 0
77 lines (64 loc) · 2.42 KB
/
1-resolve-a-merge-conflict.yml
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
name: Step 1, Resolve a merge conflict
# This step triggers after the user resolves the merge conflict
# This step sets STEP to 2
# This step closes <details id=1> and opens <details id=2>
# This will run every time we push to `my-resume` (this will be a merge commit
# since the user is resolving a merge conflict)
# Reference https://docs.github.com/en/actions/learn-github-actions/events-that-trigger-workflows
on:
workflow_dispatch:
push:
branches:
- my-resume
# Reference https://docs.github.com/en/actions/security-guides/automatic-token-authentication
permissions:
# Need `contents: read` to checkout the repository
# Need `contents: write` to update the step metadata
contents: write
jobs:
on_resolve_merge_conflict:
name: On resolve merge conflict
# We will only run this action when:
# 1. This repository isn't the template repository
# Reference https://docs.github.com/en/actions/learn-github-actions/contexts
# Reference https://docs.github.com/en/actions/learn-github-actions/expressions
if: ${{ !github.event.repository.is_template }}
# We'll run Ubuntu for performance instead of Mac or Windows
runs-on: ubuntu-latest
steps:
# We'll need to check out the repository so that we can edit the README
- name: Checkout
uses: actions/checkout@v2
with:
fetch-depth: 0 # Let's get all the branches
ref: my-resume
- name: Create and push a new file on main
run: |
echo "Make sure we are on step 1"
if [ "$(cat .github/script/STEP)" != 1 ]
then
echo "Current step is not 1"
exit 0
fi
echo "Checkout main"
git checkout main
echo "Create new file"
printf "# References\n\n* octocat 1 😈" >> references.md
echo "Commit file"
git config user.name github-actions
git config user.email [email protected]
git add references.md
git commit --message="Add references.md"
echo "Push"
git push
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
# Update README to close <details id=1> and open <details id=2>
# and set STEP to '2'
- name: Update to step 2
uses: skills/action-update-step@v1
with:
token: ${{ secrets.GITHUB_TOKEN }}
from_step: 1
to_step: 2
branch_name: my-resume