diff --git a/.github/workflows/build-browser.yml b/.github/workflows/build-browser.yml index d03efae7f4..34c69912f5 100644 --- a/.github/workflows/build-browser.yml +++ b/.github/workflows/build-browser.yml @@ -163,10 +163,6 @@ jobs: run: npm run dist:mv3 working-directory: browser-source/apps/browser - - name: Build Chrome Manifest v3 Beta - run: npm run dist:chrome:beta - working-directory: browser-source/apps/browser - - name: Upload Opera artifact uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3 with: @@ -188,13 +184,6 @@ jobs: path: browser-source/apps/browser/dist/dist-chrome-mv3.zip if-no-files-found: error - - name: Upload Chrome MV3 Beta artifact (DO NOT USE FOR PROD) - uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3 - with: - name: DO-NOT-USE-FOR-PROD-dist-chrome-MV3-beta-${{ env._BUILD_NUMBER }}.zip - path: browser-source/apps/browser/dist/dist-chrome-mv3-beta.zip - if-no-files-found: error - - name: Upload Firefox artifact uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3 with: diff --git a/apps/browser/gulpfile.js b/apps/browser/gulpfile.js index 573f86efc1..ed977df471 100644 --- a/apps/browser/gulpfile.js +++ b/apps/browser/gulpfile.js @@ -9,7 +9,6 @@ const replace = require("gulp-replace"); const manifest = require("./src/manifest.json"); const manifestVersion = parseInt(process.env.MANIFEST_VERSION || manifest.version); -const betaBuild = process.env.BETA_BUILD === "1"; const paths = { build: "./build/", @@ -17,27 +16,11 @@ const paths = { safari: "./src/safari/", }; -/** - * Converts a number to a tuple containing two Uint16's - * @param num {number} This number is expected to be a integer style number with no decimals - * - * @returns {number[]} A tuple containing two elements that are both numbers. - */ -function numToUint16s(num) { - var arr = new ArrayBuffer(4); - var view = new DataView(arr); - view.setUint32(0, num, false); - return [view.getUint16(0), view.getUint16(2)]; -} - function buildString() { var build = ""; if (process.env.MANIFEST_VERSION) { build = `-mv${process.env.MANIFEST_VERSION}`; } - if (betaBuild) { - build += "-beta"; - } if (process.env.BUILD_NUMBER && process.env.BUILD_NUMBER !== "") { build = `-${process.env.BUILD_NUMBER}`; } @@ -71,9 +54,6 @@ function distFirefox() { manifest.optional_permissions = manifest.optional_permissions.filter( (permission) => permission !== "privacy", ); - if (betaBuild) { - manifest = applyBetaLabels(manifest); - } return manifest; }); } @@ -90,9 +70,6 @@ function distOpera() { delete manifest.commands._execute_sidebar_action; } - if (betaBuild) { - manifest = applyBetaLabels(manifest); - } return manifest; }); } @@ -102,9 +79,6 @@ function distChrome() { delete manifest.applications; delete manifest.sidebar_action; delete manifest.commands._execute_sidebar_action; - if (betaBuild) { - manifest = applyBetaLabels(manifest); - } return manifest; }); } @@ -114,9 +88,6 @@ function distEdge() { delete manifest.applications; delete manifest.sidebar_action; delete manifest.commands._execute_sidebar_action; - if (betaBuild) { - manifest = applyBetaLabels(manifest); - } return manifest; }); } @@ -237,9 +208,6 @@ async function safariCopyBuild(source, dest) { delete manifest.commands._execute_sidebar_action; delete manifest.optional_permissions; manifest.permissions.push("nativeMessaging"); - if (betaBuild) { - manifest = applyBetaLabels(manifest); - } return manifest; }), ), @@ -254,30 +222,6 @@ function stdOutProc(proc) { proc.stderr.on("data", (data) => console.error(data.toString())); } -function applyBetaLabels(manifest) { - manifest.name = "Bitwarden Password Manager BETA"; - manifest.short_name = "Bitwarden BETA"; - manifest.description = "THIS EXTENSION IS FOR BETA TESTING BITWARDEN."; - if (process.env.GITHUB_RUN_ID) { - const existingVersionParts = manifest.version.split("."); // 3 parts expected 2024.4.0 - - // GITHUB_RUN_ID is a number like: 8853654662 - // which will convert to [ 4024, 3206 ] - // and a single incremented id of 8853654663 will become [ 4024, 3207 ] - const runIdParts = numToUint16s(parseInt(process.env.GITHUB_RUN_ID)); - - // Only use the first 2 parts from the given version number and base the other 2 numbers from the GITHUB_RUN_ID - // Example: 2024.4.4024.3206 - const betaVersion = `${existingVersionParts[0]}.${existingVersionParts[1]}.${runIdParts[0]}.${runIdParts[1]}`; - - manifest.version_name = `${betaVersion} beta - ${process.env.GITHUB_SHA.slice(0, 8)}`; - manifest.version = betaVersion; - } else { - manifest.version = `${manifest.version}.0`; - } - return manifest; -} - exports["dist:firefox"] = distFirefox; exports["dist:chrome"] = distChrome; exports["dist:opera"] = distOpera; diff --git a/apps/browser/package.json b/apps/browser/package.json index 5909c802b3..4a74952254 100644 --- a/apps/browser/package.json +++ b/apps/browser/package.json @@ -10,12 +10,9 @@ "build:watch:safari": "cross-env MANIFEST_VERSION=3 BROWSER=safari webpack --watch", "build:watch:mv2": "webpack --watch", "build:prod": "cross-env NODE_ENV=production NODE_OPTIONS=\"--max-old-space-size=4096\" webpack", - "build:prod:beta": "cross-env BETA_BUILD=1 NODE_ENV=production webpack", "build:prod:watch": "cross-env NODE_ENV=production webpack --watch", "dist": "npm run build:prod && gulp dist", - "dist:beta": "npm run build:prod:beta && cross-env BETA_BUILD=1 gulp dist", "dist:mv3": "cross-env MANIFEST_VERSION=3 npm run build:prod && cross-env MANIFEST_VERSION=3 gulp dist", - "dist:mv3:beta": "cross-env MANIFEST_VERSION=3 npm run build:prod:beta && cross-env MANIFEST_VERSION=3 BETA_BUILD=1 gulp dist", "dist:chrome": "npm run build:prod && gulp dist:chrome", "dist:chrome:beta": "cross-env MANIFEST_VERSION=3 npm run build:prod:beta && cross-env MANIFEST_VERSION=3 BETA_BUILD=1 gulp dist:chrome", "dist:firefox": "npm run build:prod && gulp dist:firefox",