diff --git a/.buildkite/steps/ghp_deploy.ts b/.buildkite/steps/ghp_deploy.ts index d649ebf5a2..f11a1a66a1 100644 --- a/.buildkite/steps/ghp_deploy.ts +++ b/.buildkite/steps/ghp_deploy.ts @@ -19,7 +19,7 @@ export const ghpDeployStep = createStep(() => { depends_on: ['build_storybook'], commands: ['npx ts-node .buildkite/scripts/steps/ghp_deploy.ts'], env: { - // ignore check run reporting when not master + // ignore check run reporting when not main ECH_CHECK_ID: isMaster ? 'deploy_ghp' : undefined, }, }; diff --git a/.buildkite/utils/buildkite.ts b/.buildkite/utils/buildkite.ts index a9c8fdc940..924f11b7de 100644 --- a/.buildkite/utils/buildkite.ts +++ b/.buildkite/utils/buildkite.ts @@ -59,7 +59,7 @@ export const bkEnv = (() => { checkId, username, isPullRequest, - isMaster: branch === 'master', + isMaster: branch === 'main', pullRequestNumber, buildUrl: env.buildUrl, canModifyPR: process.env.GITHUB_PR_MAINTAINER_CAN_MODIFY === 'true', diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 69388af188..77d3691c6d 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -5,7 +5,7 @@ name: Publish a Release on: workflow_dispatch: branches: - - master + - main env: ECH_NODE_VERSION: '14.x' @@ -16,9 +16,9 @@ jobs: name: Release Checks runs-on: ubuntu-latest # needs: status # Not working atm - # Runs checks when others running on master may be in process + # Runs checks when others running on main may be in process # This is likely an edge case unless published shortly following a merge - # This also covers a case where master checks did not complete/succeed + # This also covers a case where main checks did not complete/succeed # if: needs.status.outputs.allSuccess steps: - name: Check out repository diff --git a/README.md b/README.md index ac25bceeb4..923b640f91 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,10 @@

- elastic-charts logo
+ elastic-charts logo
Elastic Charts

- - Build Status - master branch + + Build Status - main branch NPM version Commitizen friendly diff --git a/github_bot/CONTRIBUTING.md b/github_bot/CONTRIBUTING.md index 6c567591c5..e54eb113e9 100644 --- a/github_bot/CONTRIBUTING.md +++ b/github_bot/CONTRIBUTING.md @@ -7,7 +7,7 @@ This GitHub app is a containerized node express application deployed on [GCP Clo ### Install dependencies ``` -cd ./github_bot/CONTRIBUTING.md +cd ./github_bot yarn install ``` diff --git a/github_bot/DEPLOYING.md b/github_bot/DEPLOYING.md index 2b85a95fd4..a4ce15ba72 100644 --- a/github_bot/DEPLOYING.md +++ b/github_bot/DEPLOYING.md @@ -1,6 +1,6 @@ # Deploying -Current deployment is [manual](https://cloud.google.com/build/docs/running-builds/start-build-command-line-api), though if necessary we can build this into a [trigger](https://cloud.google.com/build/docs/automating-builds/create-manage-triggers) via pushes to `master`. As of now this is not essential and could not be tested in a PR before merging and deploying. +Current deployment is [manual](https://cloud.google.com/build/docs/running-builds/start-build-command-line-api), though if necessary we can build this into a [trigger](https://cloud.google.com/build/docs/automating-builds/create-manage-triggers) via pushes to `main`. As of now this is not essential and could not be tested in a PR before merging and deploying. ## Setup to deploy diff --git a/github_bot/README.md b/github_bot/README.md index ed961a7d12..0752cf71ab 100644 --- a/github_bot/README.md +++ b/github_bot/README.md @@ -12,7 +12,7 @@ The code is split into two main sections as listed below, excluding shared `util API route: `/github` -This sections uses [Probot](https://github.com/probot/probot) to easily handle webhooks for any github event. These events are organized into their own directory grouping under [`github_bot/src/github/events/`](https://github.com/elastic/elastic-charts/tree/master/github_bot/src/github/events). +This sections uses [Probot](https://github.com/probot/probot) to easily handle webhooks for any github event. These events are organized into their own directory grouping under [`github_bot/src/github/events/`](https://github.com/elastic/elastic-charts/tree/main/github_bot/src/github/events). This currently handles: diff --git a/github_bot/src/env.ts b/github_bot/src/env.ts index 682ce519b8..9d84cdde02 100644 --- a/github_bot/src/env.ts +++ b/github_bot/src/env.ts @@ -58,7 +58,7 @@ const devEnv: Env = { }, }, branch: { - base: ['master', 'alpha', 'next', /\d+.\d+.\d+/, /\d+.\d+.x/, /\d+.x/, /buildkite-.+/], + base: ['main', 'alpha', 'next', /\d+.\d+.\d+/, /\d+.\d+.x/, /\d+.x/, /buildkite-.+/], }, label: { buildkite: { @@ -91,7 +91,7 @@ const prodEnv: Env = { }, }, branch: { - base: ['master', 'alpha', 'next', /\d+.\d+.\d+/, /\d+.\d+.x/, /\d+.x/], + base: ['main', 'alpha', 'next', /\d+.\d+.\d+/, /\d+.\d+.x/, /\d+.x/], }, label: { buildkite: { diff --git a/github_bot/src/github/utils.ts b/github_bot/src/github/utils.ts index 40db7580cf..cce658fc37 100644 --- a/github_bot/src/github/utils.ts +++ b/github_bot/src/github/utils.ts @@ -204,7 +204,7 @@ export async function updateAllChecks( ): Promise { const headSha = ctx.name === 'pull_request' ? ctx.payload.pull_request.head.sha : sha; if (!headSha) throw new Error('No sha provided to set check run'); - const { main, jobs } = getBuildConfig(ctx.name === 'push' && ctx.payload.ref === 'refs/heads/master'); + const { main, jobs } = getBuildConfig(ctx.name === 'push' && ctx.payload.ref === 'refs/heads/main'); const updatedCheckIds = new Set(); if (!createNew) { diff --git a/github_bot/src/utils/types.ts b/github_bot/src/utils/types.ts index 98ebc5c55d..2d2759d5c3 100644 --- a/github_bot/src/utils/types.ts +++ b/github_bot/src/utils/types.ts @@ -37,7 +37,7 @@ export interface BuildkiteTriggerBuildOptions< /** * Branch the commit belongs to. This allows you to take advantage of your pipeline and step-level branch filtering rules. - * @example "master" + * @example "main" */ branch: string; @@ -82,7 +82,7 @@ export interface BuildkiteTriggerBuildOptions< /** * For a pull request build, the base branch of the pull request. - * @example "master" + * @example "main" */ pull_request_base_branch?: string; diff --git a/packages/charts/src/_reset.scss b/packages/charts/src/_reset.scss index a6583dae0c..b82f6aa906 100644 --- a/packages/charts/src/_reset.scss +++ b/packages/charts/src/_reset.scss @@ -1,5 +1,5 @@ // Used as base reset used with EuiProvider. TODO: remove need for this file export. -// https://github.com/elastic/eui/blob/master/src/global_styling/reset/reset.ts +// https://github.com/elastic/eui/blob/main/src/global_styling/reset/reset.ts @import '../../../node_modules/@elastic/eui/src/themes/legacy/reset'; diff --git a/renovate.json b/renovate.json index 00e60d6088..a65a6fda46 100644 --- a/renovate.json +++ b/renovate.json @@ -3,7 +3,7 @@ "extends": ["config:base", "schedule:weekends", ":disableDependencyDashboard"], "ignorePaths": ["./.github/**"], "enabledManagers": ["npm"], - "baseBranches": ["master"], + "baseBranches": ["main"], "separateMajorMinor": false, "rangeStrategy": "bump", "assignAutomerge": true,