newspack-scripts 5.9.0 → 5.9.2

package/.github/workflows/reusable-i18n.yml

@@ -2,6 +2,9 @@ name: i18n
 
 on:
   workflow_call:
+    secrets:
+      GIT_COMMITTER_TOKEN:
+        required: true
 
 permissions:
   contents: write
@@ -15,6 +18,15 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
+          token: ${{ secrets.GIT_COMMITTER_TOKEN }}
+
+      - name: Configure Git
+        env:
+          GIT_COMMITTER_NAME: ${{ vars.GIT_COMMITTER_NAME || 'github-actions[bot]' }}
+          GIT_COMMITTER_EMAIL: ${{ vars.GIT_COMMITTER_EMAIL || 'github-actions[bot]@users.noreply.github.com' }}
+        run: |
+          git config user.name "$GIT_COMMITTER_NAME"
+          git config user.email "$GIT_COMMITTER_EMAIL"
 
       - name: Setup Node.js
         uses: actions/setup-node@v4
@@ -105,11 +117,6 @@ jobs:
 
       - name: Commit translation files
         if: steps.check-bot.outputs.skip != 'true'
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          REPO_NAME: ${{ github.event.repository.name }}
-          GIT_COMMITTER_NAME: ${{ vars.GIT_COMMITTER_NAME || 'github-actions[bot]' }}
-          GIT_COMMITTER_EMAIL: ${{ vars.GIT_COMMITTER_EMAIL || 'github-actions[bot]@users.noreply.github.com' }}
         run: |
           if [ "$REPO_NAME" = "newspack-theme" ]; then
             cd ./newspack-theme
@@ -126,11 +133,7 @@ jobs:
           LINES_CHANGED=${LINES_CHANGED:-0}
           echo "Lines changed in languages/: $LINES_CHANGED"
           if [ "$LINES_CHANGED" -gt 3 ]; then
-            git config user.email "$GIT_COMMITTER_EMAIL"
-            git config user.name "$GIT_COMMITTER_NAME"
-            git remote set-url origin https://x-access-token:$GITHUB_TOKEN@github.com/${{ github.repository }}.git
             git add languages/
             git commit -m "chore: update translation files [skip ci]"
-            git pull --rebase origin ${{ github.ref_name }}
-            git push origin ${{ github.ref_name }}
+            git push
           fi

package/.github/workflows/reusable-post-release.yml

@@ -6,6 +6,8 @@ permissions:
 on:
   workflow_call:
     secrets:
+      GIT_COMMITTER_TOKEN:
+        required: true
       SLACK_CHANNEL_ID:
         required: false
       SLACK_AUTH_TOKEN:
@@ -20,6 +22,15 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
+          token: ${{ secrets.GIT_COMMITTER_TOKEN }}
+
+      - name: Configure Git
+        env:
+          GIT_COMMITTER_NAME: ${{ vars.GIT_COMMITTER_NAME || 'github-actions[bot]' }}
+          GIT_COMMITTER_EMAIL: ${{ vars.GIT_COMMITTER_EMAIL || 'github-actions[bot]@users.noreply.github.com' }}
+        run: |
+          git config user.name "$GIT_COMMITTER_NAME"
+          git config user.email "$GIT_COMMITTER_EMAIL"
 
       - name: Setup Node.js
         uses: actions/setup-node@v4
@@ -32,10 +43,6 @@ jobs:
 
       - name: Perform post-release chores
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          GITHUB_REPOSITORY: ${{ github.repository }}
-          GIT_COMMITTER_NAME: github-actions[bot]
-          GITHUB_COMMITER_EMAIL: github-actions[bot]@users.noreply.github.com
           SLACK_CHANNEL_ID: ${{ secrets.SLACK_CHANNEL_ID }}
           SLACK_AUTH_TOKEN: ${{ secrets.SLACK_AUTH_TOKEN }}
         run: ./node_modules/newspack-scripts/scripts/github/post-release.sh

package/.github/workflows/reusable-release.yml

@@ -51,11 +51,3 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
         run: npm run release
-
-      - name: Upload release artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: release-artifacts
-          path: release/
-          if-no-files-found: ignore
-          retention-days: 1

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "newspack-scripts",
-	"version": "5.9.0",
+	"version": "5.9.2",
 	"description": "",
 	"bin": {
 		"newspack-scripts": "./bin/newspack-scripts.js"

package/scripts/github/post-release.sh

@@ -2,9 +2,6 @@
 
 # This script should be ran on CI after a new regular (not pre-release) version is released.
 
-git config user.name "$GIT_COMMITTER_NAME"
-git config user.email "$GITHUB_COMMITER_EMAIL"
-
 # The last commit message at this point is the automated release commit. The second-to-last
 # commit message should contain data about the merge.
 SECOND_TO_LAST_COMMIT_MSG=$(git log -n 1 --skip 1 --pretty=format:"%s")
@@ -23,13 +20,13 @@ if [[ $(echo $SECOND_TO_LAST_COMMIT_MSG | grep '^Merge .*alpha') ]]; then
   # we don't care about any alpha changes.
   git reset --hard release --
   # Force-push the alpha branch.
-  git push "https://$GITHUB_TOKEN@github.com/${GITHUB_REPOSITORY}.git" --force
+  git push --force
 else
   echo '[newspack-scripts] Release was created from a different branch than the alpha branch (e.g. a hotfix branch).'
   echo '[newspack-scripts] Alpha branch will now be updated with the lastest changes from release.'
   git merge --no-ff release -m "chore(release): merge in release $LATEST_VERSION_TAG"
   if [[ $? == 0 ]]; then
-    git push "https://$GITHUB_TOKEN@github.com/${GITHUB_REPOSITORY}.git"
+    git push
   else
     git merge --abort
     echo '[newspack-scripts] Post-release merge to alpha failed.'
@@ -55,7 +52,7 @@ git checkout trunk
 git merge --no-ff release -m "chore(release): merge in release $LATEST_VERSION_TAG"
 if [[ $? == 0 ]]; then
   echo '[newspack-scripts] Pushing updated trunk to origin.'
-  git push "https://$GITHUB_TOKEN@github.com/${GITHUB_REPOSITORY}.git"
+  git push
 else
   git merge --abort
   echo '[newspack-scripts] Post-release merge to trunk failed.'

package/scripts/github/release.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const utils = require( './utils/index.js' );
+const utils = require( '../utils/index.js' );
 
 const semanticRelease = require( 'semantic-release' );