From d4a58d3d15eaa3148ffb13cc721786d58b64a0a2 Mon Sep 17 00:00:00 2001 From: Jonny Gerig Meyer Date: Thu, 22 Jun 2023 16:34:15 -0400 Subject: [PATCH 1/2] try using add-and-commit action --- .github/workflows/shadow-repo.yml | 12 +++++++----- source/blog/002-a-change-in-plans-for-sass-33.md | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/shadow-repo.yml b/.github/workflows/shadow-repo.yml index 1b16b5cb6..6256bb4a9 100644 --- a/.github/workflows/shadow-repo.yml +++ b/.github/workflows/shadow-repo.yml @@ -54,11 +54,13 @@ jobs: 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 index 4746fe3d3..917c2176d 100644 --- 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. From 590df2c42ed3f7c27341a0bc63133c3876ec2d81 Mon Sep 17 00:00:00 2001 From: Jonny Gerig Meyer Date: Thu, 22 Jun 2023 16:39:00 -0400 Subject: [PATCH 2/2] Use GH token instead of ssh key --- .github/workflows/shadow-repo.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/shadow-repo.yml b/.github/workflows/shadow-repo.yml index 6256bb4a9..97da70d97 100644 --- 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,10 +46,10 @@ 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 ./*