chore: Less CI action duplication (#30)

Author: rfsbraz

.github/workflows/ci.yml

@@ -6,16 +6,22 @@ on:
   pull_request:
     branches: [main]
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 jobs:
   lint-and-build:
+    # Skip CI on release-please branches - code was already tested
+    if: ${{ !startsWith(github.head_ref || github.ref_name, 'release-please--') }}
     runs-on: ubuntu-latest
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
 
       - name: Setup Node.js
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@v4
         with:
           node-version: '20'
           cache: 'npm'
@@ -36,7 +42,7 @@ jobs:
         run: npm run build:zip
 
       - name: Upload artifact
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v4
         with:
           name: extension-package
           path: dist/*.zip

.github/workflows/release.yml

@@ -5,9 +5,9 @@ on:
     branches:
       - main
 
-permissions:
-  contents: write
-  pull-requests: write
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
 jobs:
   release-please:
@@ -22,6 +22,7 @@ jobs:
         id: release
         uses: googleapis/release-please-action@v4
         with:
+          token: ${{ secrets.RELEASE_PLEASE_TOKEN }}
           release-type: node
 
   build-release:
@@ -31,20 +32,17 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
 
       - name: Setup Node.js
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@v4
         with:
           node-version: '20'
           cache: 'npm'
 
       - name: Install dependencies
         run: npm ci
 
-      - name: Build validation
-        run: npm run build
-
       - name: Build all browser packages
         run: npm run build:all
 
@@ -54,50 +52,24 @@ jobs:
           tag_name: ${{ needs.release-please.outputs.tag_name }}
           files: dist/*.zip
 
-      - name: Upload Chrome artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: chrome-extension
-          path: dist/*-chrome.zip
-
-      - name: Upload Firefox artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: firefox-extension
-          path: dist/*-firefox.zip
-
-      - name: Upload Opera artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: opera-extension
-          path: dist/*-opera.zip
-
-      - name: Upload Edge artifact
+      - name: Upload build artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: edge-extension
-          path: dist/*-edge.zip
+          name: browser-extensions
+          path: dist/*.zip
+          retention-days: 1
 
   publish-to-chrome:
     needs: [release-please, build-release]
     if: ${{ needs.release-please.outputs.release_created }}
     runs-on: ubuntu-latest
 
     steps:
-      - name: Checkout
-        uses: actions/checkout@v6
-
-      - name: Setup Node.js
-        uses: actions/setup-node@v6
+      - name: Download artifacts
+        uses: actions/download-artifact@v4
         with:
-          node-version: '20'
-          cache: 'npm'
-
-      - name: Install dependencies
-        run: npm ci
-
-      - name: Build Chrome extension
-        run: npm run build:chrome
+          name: browser-extensions
+          path: dist
 
       - name: Upload to Chrome Web Store
         uses: mnao305/[email protected]
@@ -116,20 +88,11 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - name: Checkout
-        uses: actions/checkout@v6
-
-      - name: Setup Node.js
-        uses: actions/setup-node@v6
+      - name: Download artifacts
+        uses: actions/download-artifact@v4
         with:
-          node-version: '20'
-          cache: 'npm'
-
-      - name: Install dependencies
-        run: npm ci
-
-      - name: Build Firefox extension
-        run: npm run build:firefox
+          name: browser-extensions
+          path: dist
 
       - name: Upload to Firefox Add-ons
         uses: wdzeng/firefox-addon@v1
@@ -145,25 +108,16 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - name: Checkout
-        uses: actions/checkout@v6
-
-      - name: Setup Node.js
-        uses: actions/setup-node@v6
+      - name: Download artifacts
+        uses: actions/download-artifact@v4
         with:
-          node-version: '20'
-          cache: 'npm'
-
-      - name: Install dependencies
-        run: npm ci
-
-      - name: Build Edge extension
-        run: npm run build:edge
+          name: browser-extensions
+          path: dist
 
       - name: Upload to Edge Add-ons
         uses: wdzeng/edge-addon@v2
         with:
           product-id: ${{ secrets.EDGE_PRODUCT_ID }}
           client-id: ${{ secrets.EDGE_CLIENT_ID }}
-          client-secret: ${{ secrets.EDGE_CLIENT_SECRET }}
+          api-key: ${{ secrets.EDGE_API_KEY }}
           zip-path: dist/*-edge.zip

README.md

@@ -2,7 +2,7 @@
 
 [![CI](https://github.com/rfsbraz/Geocaching.com-Friends-Logs/actions/workflows/ci.yml/badge.svg)](https://github.com/rfsbraz/Geocaching.com-Friends-Logs/actions/workflows/ci.yml)
 [![Chrome Web Store](https://img.shields.io/chrome-web-store/v/bgildcbomgimjfoblhlhmaehaeieeaam)](https://chrome.google.com/webstore/detail/geocachingcom-friends-log/bgildcbomgimjfoblhlhmaehaeieeaam)
-[![Firefox Add-ons](https://img.shields.io/amo/v/geocaching-friends-logs)](https://addons.mozilla.org/firefox/addon/geocaching-friends-logs/)
+[![Firefox Add-ons](https://img.shields.io/amo/v/geocaching-friends-logs)](https://addons.mozilla.org/firefox/addon/geocaching-com-friends-logs/)
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
 
 A browser extension that displays your friends' geocaching logs at the top of every cache listing page. Never scroll through hundreds of logs again — instantly see which friends have visited a cache and what they thought about it.
@@ -22,7 +22,7 @@ A browser extension that displays your friends' geocaching logs at the top of ev
 ### Browser Extension Stores (Recommended)
 
 - **Chrome**: [Chrome Web Store](https://chrome.google.com/webstore/detail/geocachingcom-friends-log/bgildcbomgimjfoblhlhmaehaeieeaam)
-- **Firefox**: [Firefox Add-ons](https://addons.mozilla.org/firefox/addon/geocaching-friends-logs/)
+- **Firefox**: [Firefox Add-ons](https://addons.mozilla.org/firefox/addon/geocaching-com-friends-logs/)
 - **Edge**: [Edge Add-ons](https://microsoftedge.microsoft.com/addons/detail/ddbfbobfccafkoabbcmpkbpofbkfgikc)
 - **Opera**: [Opera Add-ons](https://addons.opera.com/extensions/details/geocachingcom-friends-logs/)