diff --git a/README.md b/README.md index 639c249a..6a9dea36 100644 --- a/README.md +++ b/README.md @@ -14,9 +14,8 @@ A continuous integration server (CI) serializes and signs the updated seed file ## Git flow -1. Work in feature branch and when done create a PR to `main` branch (which will be picked up by CI for staging). -2. Verify that everything works as intended via the staging endpoint `--variations-server-url=https://variations.bravesoftware.com/seed`. -3. Cherry-pick the commit to production by creating another PR to `production` branch (which will be picked up by CI again). +1. Work in feature branch and when done create a PR to `main` branch. +2. Verify that everything works as intended via PR instructions (use `--variations-pr` flag). ## Key Generation and Exchange diff --git a/src/core/base_types.ts b/src/core/base_types.ts index 60bf0296..8a1b74ee 100644 --- a/src/core/base_types.ts +++ b/src/core/base_types.ts @@ -4,8 +4,8 @@ // You can obtain one at https://mozilla.org/MPL/2.0/. export enum SeedType { - PRODUCTION, // production Brave seed (brave-variations@production) - STAGING, // staging Brave seed (brave-variations@main) + MAIN, // main Brave seed (brave-variations@main) + STAGING, // staging Brave seed (brave-variations@staging) UPSTREAM, // Chrome seed (Finch) } diff --git a/src/core/url_utils.ts b/src/core/url_utils.ts index eae926d4..727bd9c8 100644 --- a/src/core/url_utils.ts +++ b/src/core/url_utils.ts @@ -5,7 +5,7 @@ import { SeedType } from './base_types'; -export const variationsProductionUrl = 'https://variations.brave.com/seed'; +export const variationsMainUrl = 'https://variations.brave.com/seed'; export const variationsStagingUrl = 'https://variations.bravesoftware.com/seed'; export const variationsUpstreamUrl = 'https://griffin.brave.com/finch-data-private/seed.bin'; @@ -50,7 +50,7 @@ export function getStudyRawConfigUrl( const BRAVE_VARIATIONS_REPO_PATTERN = '^github\\.com/brave/brave-variations$'; if (seedType === SeedType.UPSTREAM) return `${getGitHubStorageUrl()}/blob/main/study/all-by-name/${study}`; - const branch = seedType === SeedType.PRODUCTION ? 'production' : 'main'; + const branch = seedType === SeedType.MAIN ? 'main' : 'staging'; return makeSourceGraphUrl( `"name": "${study}"`, `${BRAVE_VARIATIONS_REPO_PATTERN}@${branch}`, diff --git a/src/scripts/lint.ts b/src/scripts/lint.ts index 8a551c98..8f2d01de 100644 --- a/src/scripts/lint.ts +++ b/src/scripts/lint.ts @@ -34,7 +34,7 @@ async function main(options: Options) { process.exit(1); } if (options.base === undefined && !options.staged) { - options.base = getBaseBranch(['origin/main', 'origin/production']); + options.base = getBaseBranch(['origin/main']); console.log(`Base branch: ${options.base}`); } const passed: boolean = await lintStaged({ diff --git a/src/web/app/app.tsx b/src/web/app/app.tsx index 78bc4d40..ffed462f 100644 --- a/src/web/app/app.tsx +++ b/src/web/app/app.tsx @@ -421,7 +421,7 @@ export function App() {