Merge pull request #628 from newfold-labs/release/2.10.1

Release 2.10.1

.github/workflows/wp-i18n.yml

@@ -95,16 +95,23 @@ jobs:
       - name: Commit web files
         if: steps.changes.outcome == 'failure'
         run: |
-          git config --local user.name "${{ github.event.head_commit.author.name }}"
-          git config --local user.email "${{ github.event.head_commit.author.email }}"
+          git config --local user.name "${{ github.event.head_commit.author.name || 'GitHub Action' }}"
+          git config --local user.email "${{ github.event.head_commit.author.email || '[email protected]' }}"
           git remote -v
           git add -A
           git commit -m "WordPress i18n triggered by commit ${{ github.sha }}"
           git status
 
+      - name: Pull latest changes from remote branch
+        if: steps.changes.outcome == 'failure'
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          git fetch origin
+          git rebase origin/${{ github.event.pull_request.head.ref }}
+
       - name: Push changes
         if: steps.changes.outcome == 'failure'
-        uses: ad-m/github-push-action@master
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          branch: ${{ github.ref }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: git push origin HEAD:${{ github.event.pull_request.head.ref }}

.wp-env.json

@@ -1,5 +1,5 @@
 {
-  "core": "WordPress/WordPress#tags/6.5.5",
+  "core": "WordPress/WordPress#tags/6.6",
   "config": {
     "WP_DEBUG": true,
     "WP_DEBUG_LOG": true,

composer.json

@@ -72,13 +72,13 @@
     },
     "require": {
         "doctrine/inflector": "1.4.4 as 1.3.1",
-        "newfold-labs/wp-module-activation": "^1.0.2",
+        "newfold-labs/wp-module-activation": "^1.0.3",
         "newfold-labs/wp-module-atomic": "^1.3",
         "newfold-labs/wp-module-coming-soon": "^1.2.5",
         "newfold-labs/wp-module-context": "^1.0.1",
         "newfold-labs/wp-module-data": "^2.5.3",
-        "newfold-labs/wp-module-deactivation": "^1.2.1",
-        "newfold-labs/wp-module-ecommerce": "^1.3.36",
+        "newfold-labs/wp-module-deactivation": "^1.2.3",
+        "newfold-labs/wp-module-ecommerce": "^1.3.37",
         "newfold-labs/wp-module-features": "^1.4.2",
         "newfold-labs/wp-module-global-ctb": "^1.0.13",
         "newfold-labs/wp-module-help-center": "^2.0.0",