From 16b50852c3522b264d20e0c89405cc9584b18b9e Mon Sep 17 00:00:00 2001
From: Raymond Hill <rhill@raymondhill.net>
Date: Fri, 7 Apr 2023 13:24:57 -0400
Subject: [PATCH] Make a firefox package of uBO Lite on release

---
 .github/workflows/mv3.yml | 27 +++++++++++++++++++++------
 tools/make-mv3.sh         | 10 +++++++---
 2 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/mv3.yml b/.github/workflows/mv3.yml
index 33deb019d..47ea81643 100644
--- a/.github/workflows/mv3.yml
+++ b/.github/workflows/mv3.yml
@@ -20,14 +20,15 @@ jobs:
         with:
           persist-credentials: false
       # https://www.gnu.org/software/bash/manual/html_node/Shell-Parameter-Expansion.html
-      - name: Build uBOLite MV3 packages
+      # Chromium
+      - name: Build Chromium uBOLite MV3 packages
         run: |
-          tools/make-mv3.sh full
-          echo "PACKAGE=$(basename $(ls dist/build/uBOLite_*.mv3.zip))" >> $GITHUB_ENV
-          echo "TAGNAME=$(basename $(ls dist/build/uBOLite_*.mv3.zip) .mv3.zip)" >> $GITHUB_ENV
+          tools/make-mv3.sh chromium full
+          echo "PACKAGE=$(basename $(ls dist/build/uBOLite_*.chromium.mv3.zip))" >> $GITHUB_ENV
+          echo "TAGNAME=$(basename $(ls dist/build/uBOLite_*.chromium.mv3.zip) .chromium.mv3.zip)" >> $GITHUB_ENV
           RELEASENAME=${TAGNAME/_/ }
           echo "RELEASENAME=$RELEASENAME" >> $GITHUB_ENV
-          cp dist/build/uBOLite.mv3/log.txt dist/mv3/
+          cp dist/build/uBOLite.chromium.mv3/log.txt dist/mv3/
       - name: Commit uBOLite MV3 build log file
         # https://github.com/marketplace/actions/github-action-for-committing-changes-to-a-repository
         uses: devops-infra/action-commit-push@master
@@ -42,7 +43,21 @@ jobs:
         with:
           tag: ${{ env.TAGNAME }}
           prerelease: true
-      - name: Upload uBOLite MV3 package
+      - name: Upload Chromium uBOLite MV3 package
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: dist/build/${{ env.PACKAGE }}
+          asset_name: ${{ env.PACKAGE }}
+          asset_content_type: application/octet-stream
+      # Firefox
+      - name: Build Firefox uBOLite MV3 packages
+        run: |
+          tools/make-mv3.sh firefox full
+          echo "PACKAGE=$(basename $(ls dist/build/uBOLite_*.firefox.mv3.zip))" >> $GITHUB_ENV
+      - name: Upload Firefox uBOLite MV3 package
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/tools/make-mv3.sh b/tools/make-mv3.sh
index cfaf8b396..4b52f09ec 100755
--- a/tools/make-mv3.sh
+++ b/tools/make-mv3.sh
@@ -14,6 +14,10 @@ for i in "$@"; do
       QUICK="yes"
       shift # past argument=value
       ;;
+    full)
+      FULL="yes"
+      shift # past argument=value
+      ;;
     firefox)
       PLATFORM="firefox"
       shift # past argument=value
@@ -90,9 +94,9 @@ fi
 echo "*** uBOLite.mv3: extension ready"
 echo "Extension location: $DES/"
 
-if [ "$1" = "full" ]; then
-    echo "*** uBOLite.mv3: Creating webstore package..."
-    PACKAGENAME=uBOLite_$(jq -r .version $DES/manifest.json).mv3.zip
+if [ "$FULL" = "yes" ]; then
+    echo "*** uBOLite.mv3: Creating publishable package..."
+    PACKAGENAME="uBOLite_$(jq -r .version $DES/manifest.json).$PLATFORM.mv3.zip"
     TMPDIR=$(mktemp -d)
     mkdir -p $TMPDIR
     cp -R $DES/* $TMPDIR/