Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge to main #1117

Merged
merged 4 commits into from
Oct 28, 2024
Merged

merge to main #1117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
806e261
fix: clicking NR banner sends to local sites
gmanandhar-nr Oct 23, 2024
6adbc7c
Merge pull request #1108 from newrelic/gaurab/redirect-to-local-site
gmanandhar-nr Oct 24, 2024
b5379e0
fix: Disable branch protection for publish
LizBaker Oct 24, 2024
ac4d33c
Merge pull request #1118 from newrelic/liz/update-branch-protection
LizBaker Oct 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 40 additions & 0 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,25 @@ jobs:
run: |
echo "//registry.npmjs.org/:_authToken=$NPM_AUTH_TOKEN" > .npmrc

- name: Temporarily disable "required_pull_request_reviews" branch protection
id: disable-branch-protection
if: always()
uses: actions/github-script@v6
with:
github-token: ${{ secrets.DOCS_ENG_BOT_TOKEN }}
previews: luke-cage-preview
script: |
const result = await github.rest.repos.updateBranchProtection({
owner: context.repo.owner,
repo: context.repo.repo,
branch: 'main',
required_status_checks: null,
restrictions: null,
enforce_admins: null,
required_pull_request_reviews: null
})
console.log("Result:", result)

- name: Lerna Publish
env:
GIT_AUTHOR_NAME: ${{ env.BOT_NAME }}
Expand All @@ -42,3 +61,24 @@ jobs:
GIT_COMMITTER_EMAIL: ${{ env.BOT_EMAIL }}
GH_TOKEN: ${{ secrets.DOCS_ENG_BOT_TOKEN }}
run: yarn release

- name: Re-enable "required_pull_request_reviews" branch protection
id: enable-branch-protection
if: always()
uses: actions/github-script@v6
with:
github-token: ${{ secrets.DOCS_ENG_BOT_TOKEN }}
previews: luke-cage-preview
script: |
const result = await github.rest.repos.updateBranchProtection({
owner: context.repo.owner,
repo: context.repo.repo,
branch: 'main',
required_status_checks: null,
restrictions: null,
enforce_admins: true,
required_pull_request_reviews: {
required_approving_review_count: 0
}
})
console.log("Result:", result)
2 changes: 1 addition & 1 deletion packages/gatsby-theme-newrelic/src/components/GlobalHeader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ const GlobalHeader = ({ className, activeSite }) => {
`}
>
<ExternalLink
href="https://newrelic.com/"
href={t('header.newRelicLogoLink')}
css={css`
display: flex;
align-items: center;
Expand Down
3 changes: 3 additions & 0 deletions packages/gatsby-theme-newrelic/src/i18n/translations/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,9 @@
"submitMessage": "Thanks for your detailed feedback",
"reset": "Reset"
},
"header": {
"newRelicLogoLink": "https://newrelic.com/"
},
"footer": {
"copyright": "Copyright {{copyrightSymbol}} {{year}} New Relic Inc.",
"careers": "Careers",
Expand Down
3 changes: 3 additions & 0 deletions packages/gatsby-theme-newrelic/src/i18n/translations/es.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,9 @@
"submitMessage" : "Agradecemos tus comentarios detallados",
"reset" : "Restablecer"
},
"header": {
"newRelicLogoLink": "https://newrelic.com/es/"
},
"footer" : {
"copyright" : "Copyright {{copyrightSymbol}} {{year}} New Relic Inc.",
"careers" : "Carreras",
Expand Down
3 changes: 3 additions & 0 deletions packages/gatsby-theme-newrelic/src/i18n/translations/fr.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,9 @@
"submitMessage": "Thanks for your detailed feedback",
"reset": "Reset"
},
"header": {
"newRelicLogoLink": "https://newrelic.com/fr/"
},
"footer": {
"copyright": "Copyright {{copyrightSymbol}} {{year}} New Relic Inc.",
"careers": "Careers",
Expand Down
3 changes: 3 additions & 0 deletions packages/gatsby-theme-newrelic/src/i18n/translations/jp.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,9 @@
"submitMessage" : "詳細なフィードバックありがとうございました",
"reset" : "リセット"
},
"header": {
"newRelicLogoLink": "https://newrelic.com/jp/"
},
"footer" : {
"copyright" : "Copyright {{copyrightSymbol}} {{year}} New Relic株式会社。",
"careers" : "採用情報",
Expand Down
3 changes: 3 additions & 0 deletions packages/gatsby-theme-newrelic/src/i18n/translations/kr.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,9 @@
"submitMessage" : "자세한 피드백을 주셔서 감사합니다.",
"reset" : "재설정"
},
"header": {
"newRelicLogoLink": "https://newrelic.com/kr/"
},
"footer" : {
"copyright" : "Copyright {{copyrightSymbol}} {{year}} New Relic Inc.",
"careers" : "채용정보",
Expand Down
3 changes: 3 additions & 0 deletions packages/gatsby-theme-newrelic/src/i18n/translations/pt.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,9 @@
"submitMessage" : "Agradecemos seu feedback detalhado",
"reset" : "Redefinir"
},
"header": {
"newRelicLogoLink": "https://newrelic.com/pt/"
},
"footer" : {
"copyright" : "Copyright {{copyrightSymbol}} {{year}} New Relic Inc.",
"careers" : "Carreiras",
Expand Down
Loading