XS✔ ◾ Leave comment

.github/workflows/check-folder-name.yml

@@ -3,7 +3,7 @@ name: Check-Folder-Name
 on:
   pull_request:
     paths:
-      - '**/rule.md'
+      - "**/rule.md"
     types: [opened, synchronize]
 
 jobs:
@@ -16,36 +16,47 @@ jobs:
       pull-requests: write
 
     steps:
-    - name: Checkout code
-      uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-        token: ${{ secrets.GITHUB_TOKEN }}
-        ref: ${{ github.event.pull_request.head.ref }}
-        repository: ${{ github.event.pull_request.head.repo.full_name }}
+      - name: Checkout code
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+          token: ${{ secrets.GITHUB_TOKEN }}
+          ref: ${{ github.event.pull_request.head.ref }}
+          repository: ${{ github.event.pull_request.head.repo.full_name }}
 
-    - name: Check for modified rule.md
-      id: check_modified
-      run: |
-        if git diff --name-only $(git merge-base origin/main HEAD) | grep -q 'rule.md'; then
-          echo "modified=true" >> "$GITHUB_OUTPUT"
-        else
-          echo "modified=false" >> "$GITHUB_OUTPUT"
-        fi
+      - name: Check for modified rule.md
+        id: check_modified
+        run: |
+          if git diff --name-only $(git merge-base origin/main HEAD) | grep -q 'rule.md'; then
+            echo "modified=true" >> "$GITHUB_OUTPUT"
+          else
+            echo "modified=false" >> "$GITHUB_OUTPUT"
+          fi
 
-    - name: Rename folders if necessary
-      id: rename_folders
-      if: steps.check_modified.outputs.modified == 'true'
-      run: |
-        sh .workflow/rename-folders.sh
+      - name: Rename folders if necessary
+        id: rename_folders
+        if: steps.check_modified.outputs.modified == 'true'
+        run: |
+          sh .workflow/rename-folders.sh
 
-    - name: Commit and push changes
-      if: steps.rename_folders.outputs.rename == 'true'
-      run: |
-        git config --global user.name 'github-actions[bot]'
-        git config --global user.email 'github-actions[bot]@users.noreply.github.com'
-        git add .
-        git commit -m "Rename folder to match URI"
-        git push || true
-        echo "Auto-fix applied"
+      - name: Commit and push changes
+        if: steps.rename_folders.outputs.rename == 'true'
+        run: |
+          git config --global user.name 'github-actions[bot]'
+          git config --global user.email 'github-actions[bot]@users.noreply.github.com'
+          git add .
+          git commit -m "Rename folder to match URI"
+          git push || true
+          echo "Auto-fix applied"
 
+      - name: Comment on PR
+        # if: success() && github.event.pull_request.head.repo.fork == false
+        if: success() && steps.rename_folders.outputs.rename == 'true'
+        uses: mshick/add-pr-comment@v2
+        with:
+          message: |
+            Hi @${{ github.event.pull_request.user.login }},
+            The URI of the modified rule didn't match the folder name. This has been automatically fixed.
+            For more details, please check: https://github.com/SSWConsulting/SSW.Rules.Content/wiki/GitHub-Action---Check-Folder-Name
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          repo-token-user-login: "github-actions[bot]"

rules/3-steps-to-a-pbi/rule.md → 3-steps-to-a-pbi/rule.md

@@ -24,6 +24,7 @@ related:
   - done-do-you-know-when-to-send-a-done-email-in-scrum
   - close-pbis-with-context
 redirects:
+  - 3-steps-to-a-pbi1
   - do-you-know-the-3-steps-to-completing-a-pbi
   - do-you-know-the-3-steps-to-a-pbi
 created: 2013-08-30T06:33:21.000Z

rules/4-quadrants-important-and-urgent/rule.md → 4-quadrants-important-and-urgent1/rule.md

@@ -1,13 +1,19 @@
 ---
 type: rule
 title: Priorities - Do you know the 4 quadrants about important and urgent tasks?
-uri: 4-quadrants-important-and-urgent
+uri: 4-quadrants-important-and-urgent1
+<<<<<<< HEAD:rules/4-quadrants-important-and-urgent/rule.md
+=======
+redirects:
+  - 4-quadrants-important-and-urgent
+>>>>>>> 5573bdbd2b09b8ea0585ce229ab16d762ad50c4f:4-quadrants-important-and-urgent1/rule.md
 authors:
   - title: Adam Cogan
     url: https://www.ssw.com.au/people/adam-cogan
 created: 2022-04-28T16:29:02.708Z
 guid: 202045cc-5133-4c1e-bed3-0416b899a496
 ---
+
 Most people do the urgent stuff and then have less time for the important stuff. Let's say you receive 2 emails... one email to fix your timesheets and another to change the logo on the home page. How do you work out what is more important?
 
 There is a well-known quadrant where people look at where they spend their time. The key is to reduce burning time on 'urgent and not important' stuff (e.g. most notifications on your phone and most Teams calls) and spend time on the important stuff that is not urgent (e.g. stuff at the top of our backlog).