From f74aa6f31418be5cf096bbe15adffff8f0826ff6 Mon Sep 17 00:00:00 2001 From: Matt Gibson Date: Thu, 18 Aug 2022 10:07:02 -0600 Subject: [PATCH] Add Manifest v3 artifact to pipelines (#3331) This requires a second build due to the differences being handled in webpack. --- .github/workflows/build-browser.yml | 11 +++++++++++ apps/browser/gulpfile.js | 3 +++ apps/browser/package.json | 2 +- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-browser.yml b/.github/workflows/build-browser.yml index 77303768f7..de92b36433 100644 --- a/.github/workflows/build-browser.yml +++ b/.github/workflows/build-browser.yml @@ -143,6 +143,10 @@ jobs: npm run dist npm run test + - name: Build Manifest v3 + run: | + npm run dist:chrome:mv3 + - name: Gulp run: gulp ci @@ -181,6 +185,13 @@ jobs: path: apps/browser/dist/dist-chrome.zip if-no-files-found: error + - name: Upload Chrome MV3 artifact + uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535 # v3.0.0 + with: + name: dist-chrome-MV3-${{ env._BUILD_NUMBER }}.zip + path: apps/browser/dist/dist-chrome-MV3.zip + if-no-files-found: error + - name: Upload Firefox artifact uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535 # v3.0.0 with: diff --git a/apps/browser/gulpfile.js b/apps/browser/gulpfile.js index 87fb086ca6..6acb024719 100644 --- a/apps/browser/gulpfile.js +++ b/apps/browser/gulpfile.js @@ -34,6 +34,9 @@ const filters = { function buildString() { var build = ""; + if (process.env.MANIFEST_VERSION) { + build = `-mv${process.env.MANIFEST_VERSION}`; + } if (process.env.BUILD_NUMBER && process.env.BUILD_NUMBER !== "") { build = `-${process.env.BUILD_NUMBER}`; } diff --git a/apps/browser/package.json b/apps/browser/package.json index f3a2b8b00b..1be1143068 100644 --- a/apps/browser/package.json +++ b/apps/browser/package.json @@ -10,7 +10,7 @@ "build:prod:watch": "cross-env NODE_ENV=production webpack --watch", "dist": "npm run build:prod && gulp dist", "dist:chrome": "npm run build:prod && gulp dist:chrome", - "dist:chrome:mv3": "cross-env MANIFEST_VERSION=3 npm run build:prod && gulp dist:chrome", + "dist:chrome:mv3": "cross-env MANIFEST_VERSION=3 npm run build:prod && cross-env MANIFEST_VERSION=3 gulp dist:chrome", "dist:firefox": "npm run build:prod && gulp dist:firefox", "dist:opera": "npm run build:prod && gulp dist:opera", "dist:safari": "npm run build:prod && gulp dist:safari",