From 8b560968f48c8c0d4e24498658f0da3fd17993d3 Mon Sep 17 00:00:00 2001
From: wtetsu <tewatana@gmail.com>
Date: Sat, 30 Nov 2024 12:14:43 +0900
Subject: [PATCH] Maintain CI

---
 .github/workflows/build-firefox.yml           | 27 -------------------
 .github/workflows/build-safari.yml            |  6 ++++-
 .../workflows/{build-chrome.yml => build.yml} |  9 ++++---
 3 files changed, 10 insertions(+), 32 deletions(-)
 delete mode 100644 .github/workflows/build-firefox.yml
 rename .github/workflows/{build-chrome.yml => build.yml} (70%)

diff --git a/.github/workflows/build-firefox.yml b/.github/workflows/build-firefox.yml
deleted file mode 100644
index 1d1d6ee..0000000
--- a/.github/workflows/build-firefox.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-name: Build for Firefox
-
-on: [push, pull_request]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    strategy:
-      matrix:
-        node-version: [22.x, 23.x]
-
-    steps:
-      - uses: actions/checkout@v4
-      - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v4
-        with:
-          node-version: ${{ matrix.node-version }}
-      - name: Install Packages
-        run: npm install
-      - name: Build
-        run: npm run release-firefox
-      - name: Upload Build as Artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: dist-firefox-${{ matrix.node-version }}
-          path: dist-firefox
diff --git a/.github/workflows/build-safari.yml b/.github/workflows/build-safari.yml
index e94c6a6..8d94cd8 100644
--- a/.github/workflows/build-safari.yml
+++ b/.github/workflows/build-safari.yml
@@ -4,7 +4,7 @@ on: [push, pull_request]
 
 jobs:
   build:
-    runs-on: macos-12
+    runs-on: macos-latest
 
     strategy:
       matrix:
@@ -16,6 +16,10 @@ jobs:
         uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node-version }}
+      - name: Install xcrun
+        run: sudo xcode-select -s /Library/Developer/CommandLineTools
+      - name: Install Safari Web Extension Converter
+        run: sudo xcode-select -s /Applications/Xcode.app
       - name: Install Packages
         run: npm install
       - name: Build
diff --git a/.github/workflows/build-chrome.yml b/.github/workflows/build.yml
similarity index 70%
rename from .github/workflows/build-chrome.yml
rename to .github/workflows/build.yml
index de327c2..970e968 100644
--- a/.github/workflows/build-chrome.yml
+++ b/.github/workflows/build.yml
@@ -1,4 +1,4 @@
-name: Build for Chrome
+name: Build
 
 on: [push, pull_request]
 
@@ -8,6 +8,7 @@ jobs:
 
     strategy:
       matrix:
+        platform: [chrome, firefox]
         node-version: [22.x, 23.x]
 
     steps:
@@ -19,9 +20,9 @@ jobs:
       - name: Install Packages
         run: npm install
       - name: Build
-        run: npm run release-chrome
+        run: npm run release-${{ matrix.platform }}
       - name: Upload Build as Artifact
         uses: actions/upload-artifact@v4
         with:
-          name: dist-chrome-${{ matrix.node-version }}
-          path: dist-chrome
+          name: dist-${{ matrix.platform }}-${{ matrix.node-version }}
+          path: dist-${{ matrix.platform }}