Dev

.github/workflows/release.yml

@@ -1,21 +1,39 @@
 name: Release
-"on":
+
+on:
   push:
     branches:
       - main
+
+concurrency:
+  group: release
+  cancel-in-progress: true
+
 jobs:
   build-and-release:
     runs-on: ubuntu-latest
     permissions: write-all
+
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
+
       - name: Set up Node.js
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v4
         with:
-          node-version: 20
+          node-version: 24
+
+      - name: Cache dependencies
+        uses: actions/cache@v4
+        with:
+          path: ~/.npm
+          key: ${{ runner.os }}-node-${{ hashFiles('package-lock.json') }}
+          restore-keys: |
+            ${{ runner.os }}-node-
+
       - name: Install dependencies
         run: npm ci
+
       - name: Run Semantic Release
         run: |
           touch .env
@@ -24,21 +42,36 @@ jobs:
         env:
           GH_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
           CROWDIN_TOKEN: "${{ secrets.CROWDIN_TOKEN }}"
+
+      - name: Configure Git identity
+        run: |
+          git config user.name "github-actions[bot]"
+          git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
+          git remote set-url origin https://x-access-token:${GH_TOKEN}@github.com/${{ github.repository }}.git
+        env:
+          GH_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+
+      - name: Fetch all branches
+        run: git fetch --all
+
       - name: Push changes to main branch
+        if: success()
         run: |
-          # Ensure we are on the main branch
           git checkout main
           git add ./src/i18n/index.ts
-          git commit -m "Update i18n"
-          # Push local changes to the main branch
-          git push origin main
+          if git diff --cached --quiet; then
+            echo "No changes to commit on main."
+          else
+            git commit -m "Update i18n" --no-verify
+            git push origin main
+          fi
+        env:
+          GH_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+
       - name: Merge changes from main into dev
+        if: success()
         run: |
-          # Switch to the dev branch
           git checkout dev
-
-          # Merge changes from the main branch into dev
-          git merge main
-
-          # Push changes to the dev branch
+          git pull --rebase origin dev
+          git merge origin/main --no-edit || echo "No merge necessary"
           git push origin dev

README.md

@@ -318,7 +318,8 @@ Contributions to the YouTube Enhancer Extension are welcome! If you'd like to co
       <td align="center" valign="top" width="14.28%"><a href="https://sites.google.com/u/0/d/1OdIAWachs1svsjOS4lT9jqwlE632B6rP"><img src="https://avatars.githubusercontent.com/u/121247693?v=4?s=100" width="100px;" alt="Lexiosity"/><br /><sub><b>Lexiosity</b></sub></a><br /><a href="#bug-Lexiosity" title="Bug reports">🐛</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/HelloIamarandomperson"><img src="https://avatars.githubusercontent.com/u/136181387?v=4?s=100" width="100px;" alt="HelloIamarandomperson"/><br /><sub><b>HelloIamarandomperson</b></sub></a><br /><a href="#code-HelloIamarandomperson" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/TheMajor-GitHub"><img src="https://avatars.githubusercontent.com/u/94167392?v=4?s=100" width="100px;" alt="The Major"/><br /><sub><b>The Major</b></sub></a><br /><a href="#ideas-TheMajor-GitHub" title="Ideas, Planning, & Feedback">🤔</a></td>
-			<td align="center" valign="top" width="14.28%"><a href="https://github.com/dnicolson"><img src="https://avatars.githubusercontent.com/u/2276355?v=4?s=100" width="100px;" alt="Dave Nicolson"/><br /><sub><b>Dave Nicolson</b></sub></a><br /><a href="#code-dnicolson" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/dnicolson"><img src="https://avatars.githubusercontent.com/u/2276355?v=4?s=100" width="100px;" alt="Dave Nicolson"/><br /><sub><b>Dave Nicolson</b></sub></a><br /><a href="#code-dnicolson" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Dheatly23"><img src="https://avatars.githubusercontent.com/u/71598333?v=4?s=100" width="100px;" alt="Dheatly23"/><br /><sub><b>Dheatly23</b></sub></a><br /><a href="#code-Dheatly23" title="Code">💻</a></td>
     </tr>
   </tbody>
 </table>