diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4a32e71d1..9b8535094 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -4,7 +4,7 @@ on: push: branches: # todo: change this branch name - - master + - main env: BOT_NAME: nr-opensource-bot @@ -105,7 +105,7 @@ jobs: uses: ad-m/github-push-action@v0.6.0 with: github_token: ${{ secrets.OPENSOURCE_BOT_TOKEN }} - branch: master + branch: main generate-changelog: runs-on: ubuntu-latest diff --git a/.releaserc b/.releaserc index 699af43a6..d1b6241b8 100644 --- a/.releaserc +++ b/.releaserc @@ -1,5 +1,5 @@ { - "branches": ["master"], + "branches": ["main"], "plugins": [ "@semantic-release/commit-analyzer", "@semantic-release/release-notes-generator", diff --git a/amplify.yml b/amplify.yml index d99a1de0f..7c995e673 100644 --- a/amplify.yml +++ b/amplify.yml @@ -7,7 +7,7 @@ frontend: build: commands: - | - if [ "${AWS_BRANCH}" = "master" ]; then + if [ "${AWS_BRANCH}" = "main" ]; then npm run build:production; else npm run build:staging; diff --git a/src/components/Footer.js b/src/components/Footer.js index 5452fd58c..d556bf36c 100644 --- a/src/components/Footer.js +++ b/src/components/Footer.js @@ -38,7 +38,7 @@ const Footer = ({ className }) => { {fileRelativePath && !isComponentDoc && ( Edit this page diff --git a/src/components/GlobalHeader.js b/src/components/GlobalHeader.js index 7f8d72f97..b2725ae79 100644 --- a/src/components/GlobalHeader.js +++ b/src/components/GlobalHeader.js @@ -66,7 +66,7 @@ const GlobalHeader = ({ className }) => { {fileRelativePath && !isComponentDoc && (