Merge pull request sass#67 from oddbird/workflow-updates

Update shadow-repo workflow.
asaf400 · Jun 22, 2023 · a0e0e77 · a0e0e77
2 parents 06abd86 + 292f193
commit a0e0e77
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/.github/workflows/shadow-repo.yml b/.github/workflows/shadow-repo.yml
@@ -21,7 +21,7 @@ jobs:
         uses: actions/checkout@v3
         with:
           repository: ${{ vars.SHADOW_OWNER }}/${{ vars.SHADOW_REPO }}
-          ssh-key: ${{ secrets.SHADOW_REPO_PRIVATE_KEY }}
+          token: ${{ secrets.GH_TOKEN }}
           ref: main
       - name: Create branch on shadow repo
         if: github.event_name == 'create'
@@ -46,19 +46,21 @@ jobs:
         uses: actions/checkout@v3
         with:
           repository: ${{ vars.SHADOW_OWNER }}/${{ vars.SHADOW_REPO }}
-          ssh-key: ${{ secrets.SHADOW_REPO_PRIVATE_KEY }}
+          token: ${{ secrets.GH_TOKEN }}
           ref: ${{ github.ref_name }}
           path: shadow-repo
-      - name: Push to shadow branch
+      - name: Update shadow repo files
         run: |
           cd shadow-repo
           rm -rf ./*
           cp -rT ../_site .
-          git config user.name github-actions
-          git config user.email github-actions@github.com
-          git add -A
-          git commit --allow-empty -m "Update from https://github.com/${{ github.repository }}/commit/${{ github.sha }}"
-          git push origin
+      - uses: EndBug/add-and-commit@v9
+        with:
+          cwd: shadow-repo
+          author_name: Sass Bot
+          author_email: sass.bot.beep.boop@gmail.com
+          message: Update from https://github.com/${{ github.repository }}/commit/${{ github.sha }}
+          commit: --allow-empty
 
   diff-link:
     name: Create comment to diff link

diff --git a/source/blog/002-a-change-in-plans-for-sass-33.md b/source/blog/002-a-change-in-plans-for-sass-33.md
@@ -75,7 +75,7 @@ selector lists easily.
 
 This means that **`&-suffix` will be supported in Sass 3.3**, without needing
 `#{}` or `@at-root`. I've created [issue
-1055](https://github.com/nex3/sass/issues/1055) to track it. When compiling
+1055](https://github.com/sass/sass/issues/1055) to track it. When compiling
 these selectors, if the parent selector is one that would result in an invalid
 selector (e.g. `*-suffix` or `:nth-child(1)-suffix`), we'll throw an error there
 describing why that selector was generated.