updated exercise to put proper step1 for resolve merge conflict #9
This file contains hidden or 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: Step 0 | |
| on: | |
| push: | |
| branches: | |
| - main | |
| permissions: | |
| contents: write | |
| actions: write | |
| issues: write | |
| env: | |
| STEP_1_FILE: ".github/steps/1-create-a-pr.md" | |
| jobs: | |
| start_exercise: | |
| if: | | |
| !github.event.repository.is_template | |
| name: Start Exercise | |
| uses: skills/exercise-toolkit/.github/workflows/[email protected] | |
| with: | |
| exercise-title: "Resolve Merge Conflicts" | |
| intro-message: "Let's learn how to resolve merge conflicts when collaborating on GitHub." | |
| prepare_merge_conflict: | |
| name: Prepare merge conflict | |
| runs-on: ubuntu-latest | |
| needs: [start_exercise] | |
| env: | |
| ISSUE_URL: ${{ needs.start_exercise.outputs.issue-url }} | |
| steps: | |
| - name: Checkout | |
| uses: actions/checkout@v4 | |
| with: | |
| fetch-depth: 0 | |
| - name: Simulate conflict between main and my-resume | |
| run: | | |
| git checkout -b my-resume | |
| git config user.name github-actions[bot] | |
| git config user.email github-actions[bot]@users.noreply.github.com | |
| sed -i 's/1/2/' .github/steps/-step.txt | |
| git add .github/steps/-step.txt | |
| git commit -m "Update step in my-resume" | |
| git push origin my-resume | |
| git checkout main | |
| sed -i 's/Experience/Jobs/' resume.md | |
| git add resume.md | |
| git commit -m "Update resume.md in main" | |
| git push origin main | |
| env: | |
| GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | |
| post_next_step_content: | |
| name: Post next step content | |
| runs-on: ubuntu-latest | |
| needs: [start_exercise] | |
| env: | |
| ISSUE_URL: ${{ needs.start_exercise.outputs.issue-url }} | |
| steps: | |
| - name: Checkout | |
| uses: actions/checkout@v4 | |
| - name: Get response templates | |
| uses: actions/checkout@v4 | |
| with: | |
| repository: skills/exercise-toolkit | |
| path: exercise-toolkit | |
| ref: v0.5.0 | |
| - name: Create comment - add step content | |
| run: | | |
| gh issue comment "$ISSUE_URL" \ | |
| --body-file "$STEP_1_FILE" | |
| env: | |
| GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} | |
| - name: Create comment - watching for progress | |
| run: | | |
| gh issue comment "$ISSUE_URL" \ | |
| --body-file "exercise-toolkit/markdown-templates/step-feedback/watching-for-progress.md" | |
| env: | |
| GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} | |
| - name: Enable next step workflow | |
| run: | | |
| gh workflow enable "Step 1" | |
| env: | |
| GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} |