mirror of
https://github.com/opus-tango/skills-resolve-merge-conflicts.git
synced 2026-03-20 03:55:26 +00:00
Initial commit
This commit is contained in:
Nayan Sawyer
91
.github/workflows/0-welcome.yml
vendored
Normal file
91
.github/workflows/0-welcome.yml
vendored
Normal file
@@ -0,0 +1,91 @@
|
||||
name: Step 0, Welcome
|
||||
|
||||
# This step triggers after the learner creates a new repository from the template.
|
||||
# This workflow updates from step 0 to step 1.
|
||||
|
||||
# This will run every time we create push a commit to `main`.
|
||||
# Reference: https://docs.github.com/en/actions/learn-github-actions/events-that-trigger-workflows
|
||||
on:
|
||||
workflow_dispatch:
|
||||
push:
|
||||
branches:
|
||||
- main
|
||||
|
||||
# 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:
|
||||
# Get the current step to only run the main job when the learner is on the same step.
|
||||
get_current_step:
|
||||
name: Check current step number
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v3
|
||||
- id: get_step
|
||||
run: |
|
||||
echo "current_step=$(cat ./.github/steps/-step.txt)" >> $GITHUB_OUTPUT
|
||||
outputs:
|
||||
current_step: ${{ steps.get_step.outputs.current_step }}
|
||||
|
||||
on_start:
|
||||
name: On start
|
||||
needs: get_current_step
|
||||
|
||||
# We will only run this action when:
|
||||
# 1. This repository isn't the template repository.
|
||||
# 2. The step is currently 0.
|
||||
# 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
|
||||
&& needs.get_current_step.outputs.current_step == 0 }}
|
||||
|
||||
# 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@v3
|
||||
with:
|
||||
fetch-depth: 0 # Let's get all the branches.
|
||||
|
||||
- name: Prepare a branch
|
||||
run: |
|
||||
echo "Make sure we are on step 0"
|
||||
if [ "$(cat .github/steps/-step.txt)" != 0 ]
|
||||
then
|
||||
echo "Current step is not 0"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
echo "Make a branch"
|
||||
BRANCH=my-resume
|
||||
git checkout -b $BRANCH
|
||||
|
||||
echo "Update resume.md"
|
||||
sed -i.bak 's/Experience/Job History/' resume.md
|
||||
|
||||
echo "Make a commit"
|
||||
git config user.name github-actions
|
||||
git config user.email github-actions@github.com
|
||||
git add resume.md
|
||||
git commit --message="Update resume.md in my-resume"
|
||||
|
||||
echo "Push"
|
||||
git push --set-upstream origin $BRANCH
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
|
||||
# In README.md, switch step 0 for step 1.
|
||||
- name: Update to step 1
|
||||
uses: skills/action-update-step@v2
|
||||
with:
|
||||
token: ${{ secrets.GITHUB_TOKEN }}
|
||||
from_step: 0
|
||||
to_step: 1
|
||||
branch_name: my-resume
|
||||
93
.github/workflows/1-create-a-pr.yml
vendored
Normal file
93
.github/workflows/1-create-a-pr.yml
vendored
Normal file
@@ -0,0 +1,93 @@
|
||||
name: Step 1, Create a pull request
|
||||
|
||||
# This step triggers after the learner creates a pull request for the my-resume branch
|
||||
# This workflow updates from step 1 to step 2.
|
||||
|
||||
# This will run every time we open a pull request.
|
||||
# Reference: https://docs.github.com/en/actions/learn-github-actions/events-that-trigger-workflows
|
||||
on:
|
||||
workflow_dispatch:
|
||||
pull_request:
|
||||
types: [opened]
|
||||
|
||||
# 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:
|
||||
# Get the current step to only run the main job when the learner is on the same step.
|
||||
get_current_step:
|
||||
name: Check current step number
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v3
|
||||
- id: get_step
|
||||
run: |
|
||||
echo "current_step=$(cat ./.github/steps/-step.txt)" >> $GITHUB_OUTPUT
|
||||
outputs:
|
||||
current_step: ${{ steps.get_step.outputs.current_step }}
|
||||
|
||||
on_create_pr:
|
||||
name: On create PR
|
||||
needs: get_current_step
|
||||
|
||||
# We will only run this action when:
|
||||
# 1. This repository isn't the template repository.
|
||||
# 2. The step is currently 1.
|
||||
# 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
|
||||
&& needs.get_current_step.outputs.current_step == 1 }}
|
||||
|
||||
# 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@v3
|
||||
with:
|
||||
fetch-depth: 0 # Let's get all the branches.
|
||||
|
||||
- name: Prepare a merge conflict
|
||||
run: |
|
||||
echo "Make sure we are on step 1"
|
||||
if [ "$(cat .github/steps/-step.txt)" != 1 ]
|
||||
then
|
||||
echo "Current step is not 1"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
echo "Manually update step in my-resume to match step in main branch"
|
||||
git checkout my-resume
|
||||
git config user.name github-actions
|
||||
git config user.email github-actions@github.com
|
||||
sed -i.bak 's/1/2/' .github/steps/-step.txt
|
||||
git add .github/steps/-step.txt
|
||||
git commit --message="Update step in my-resume"
|
||||
echo "Push"
|
||||
git push origin my-resume
|
||||
|
||||
echo "Create a merge conflict in main"
|
||||
git checkout main
|
||||
sed -i.bak 's/Experience/Jobs/' resume.md
|
||||
git add resume.md
|
||||
git commit --message="Update resume.md in main"
|
||||
|
||||
echo "Push"
|
||||
git push origin main
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
|
||||
# In README.md, switch step 1 for step 2.
|
||||
- name: Update to step 2
|
||||
uses: skills/action-update-step@v2
|
||||
with:
|
||||
token: ${{ secrets.GITHUB_TOKEN }}
|
||||
from_step: 1
|
||||
to_step: 2
|
||||
branch_name: my-resume
|
||||
92
.github/workflows/2-resolve-a-merge-conflict.yml
vendored
Normal file
92
.github/workflows/2-resolve-a-merge-conflict.yml
vendored
Normal file
@@ -0,0 +1,92 @@
|
||||
name: Step 2, Resolve a merge conflict
|
||||
|
||||
# This step triggers after the user resolves the merge conflict.
|
||||
# This workflow updates from step 2 to step 3.
|
||||
|
||||
# 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:
|
||||
# Get the current step to only run the main job when the learner is on the same step.
|
||||
get_current_step:
|
||||
name: Check current step number
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v3
|
||||
- id: get_step
|
||||
run: |
|
||||
echo "current_step=$(cat ./.github/steps/-step.txt)" >> $GITHUB_OUTPUT
|
||||
outputs:
|
||||
current_step: ${{ steps.get_step.outputs.current_step }}
|
||||
|
||||
on_resolve_merge_conflict:
|
||||
name: On resolve merge conflict
|
||||
needs: get_current_step
|
||||
|
||||
# We will only run this action when:
|
||||
# 1. This repository isn't the template repository.
|
||||
# 2. The step is currently 2.
|
||||
# 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
|
||||
&& needs.get_current_step.outputs.current_step == 2 }}
|
||||
|
||||
# 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@v3
|
||||
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 2"
|
||||
if [ "$(cat .github/steps/-step.txt)" != 2 ]
|
||||
then
|
||||
echo "Current step is not 2"
|
||||
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 github-actions@github.com
|
||||
git add references.md
|
||||
git commit --message="Add references.md"
|
||||
|
||||
echo "Push"
|
||||
git push
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
|
||||
# In README.md, switch step 2 for step 3.
|
||||
- name: Update to step 3
|
||||
uses: skills/action-update-step@v2
|
||||
with:
|
||||
token: ${{ secrets.GITHUB_TOKEN }}
|
||||
from_step: 2
|
||||
to_step: 3
|
||||
branch_name: my-resume
|
||||
67
.github/workflows/3-create-your-own-conflict.yml
vendored
Normal file
67
.github/workflows/3-create-your-own-conflict.yml
vendored
Normal file
@@ -0,0 +1,67 @@
|
||||
name: Step 3, Create your own conflict
|
||||
|
||||
# This step triggers after the user creates `references.md` in the `my-resume` branch.
|
||||
# This workflow updates from step 3 to step 4.
|
||||
|
||||
# This will run every time we push to the `reference.md` file in the `my-resume` branch.
|
||||
# Reference: https://docs.github.com/en/actions/learn-github-actions/events-that-trigger-workflows
|
||||
on:
|
||||
workflow_dispatch:
|
||||
push:
|
||||
branches:
|
||||
- my-resume
|
||||
paths:
|
||||
- "references.md"
|
||||
|
||||
# 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:
|
||||
# Get the current step to only run the main job when the learner is on the same step.
|
||||
get_current_step:
|
||||
name: Check current step number
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v3
|
||||
- id: get_step
|
||||
run: |
|
||||
echo "current_step=$(cat ./.github/steps/-step.txt)" >> $GITHUB_OUTPUT
|
||||
outputs:
|
||||
current_step: ${{ steps.get_step.outputs.current_step }}
|
||||
|
||||
on_create_references_md:
|
||||
name: On create references.md
|
||||
needs: get_current_step
|
||||
|
||||
# We will only run this action when:
|
||||
# 1. This repository isn't the template repository.
|
||||
# 2. The step is currently 3.
|
||||
# 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
|
||||
&& needs.get_current_step.outputs.current_step == 3 }}
|
||||
|
||||
# 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@v3
|
||||
with:
|
||||
fetch-depth: 0 # Let's get all the branches.
|
||||
ref: my-resume
|
||||
|
||||
# In README.md, switch step 2 for step 3.
|
||||
- name: Update to step 4
|
||||
uses: skills/action-update-step@v2
|
||||
with:
|
||||
token: ${{ secrets.GITHUB_TOKEN }}
|
||||
from_step: 3
|
||||
to_step: 4
|
||||
branch_name: my-resume
|
||||
64
.github/workflows/4-merge-your-pull-request.yml
vendored
Normal file
64
.github/workflows/4-merge-your-pull-request.yml
vendored
Normal file
@@ -0,0 +1,64 @@
|
||||
name: Step 4, Merge your pull request
|
||||
|
||||
# This step triggers after a pull requst is merged to `main`.
|
||||
# This workflow updates from step 4 to step X.
|
||||
|
||||
# This will run every time we create push a commit to `main`.
|
||||
# Reference: https://docs.github.com/en/actions/learn-github-actions/events-that-trigger-workflows
|
||||
on:
|
||||
workflow_dispatch:
|
||||
push:
|
||||
branches:
|
||||
- main
|
||||
|
||||
# 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:
|
||||
# Get the current step to only run the main job when the learner is on the same step.
|
||||
get_current_step:
|
||||
name: Check current step number
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v3
|
||||
- id: get_step
|
||||
run: |
|
||||
echo "current_step=$(cat ./.github/steps/-step.txt)" >> $GITHUB_OUTPUT
|
||||
outputs:
|
||||
current_step: ${{ steps.get_step.outputs.current_step }}
|
||||
|
||||
on_merge:
|
||||
name: On merge
|
||||
needs: get_current_step
|
||||
|
||||
# We will only run this action when:
|
||||
# 1. This repository isn't the template repository.
|
||||
# 2. The step is currently 4.
|
||||
# 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
|
||||
&& needs.get_current_step.outputs.current_step == 4 }}
|
||||
|
||||
# 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@v3
|
||||
with:
|
||||
fetch-depth: 0 # Let's get all the branches.
|
||||
|
||||
# In README.md, switch step 3 for step X.
|
||||
- name: Update to step X
|
||||
uses: skills/action-update-step@v2
|
||||
with:
|
||||
token: ${{ secrets.GITHUB_TOKEN }}
|
||||
from_step: 4
|
||||
to_step: X
|
||||
branch_name: my-resume
|
||||
Reference in New Issue
Block a user