Skip to content

Commit

Permalink
Merge pull request #788 from newrelic/campfire/update-workflow
Browse files Browse the repository at this point in the history
chore: update branch name in workflow files
  • Loading branch information
caylahamann authored Sep 25, 2020
2 parents f6a7d9c + 85b2c9d commit 45e22b7
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 10 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/fetch-related-content.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jobs:
const result = await github.repos.updateBranchProtection({
owner: context.repo.owner,
repo: context.repo.repo,
branch: 'main',
branch: 'develop',
required_status_checks: null,
restrictions: null,
enforce_admins: null,
Expand All @@ -71,7 +71,7 @@ jobs:
uses: ad-m/[email protected]
with:
github_token: ${{ secrets.OPENSOURCE_BOT_TOKEN }}
branch: main
branch: develop

- name: Re-enable "required_pull_request_reviews" branch protection
id: enable-branch-protection
Expand All @@ -84,7 +84,7 @@ jobs:
const result = await github.repos.updateBranchProtection({
owner: context.repo.owner,
repo: context.repo.repo,
branch: 'main',
branch: 'develop',
required_status_checks: null,
restrictions: null,
enforce_admins: true,
Expand Down
13 changes: 6 additions & 7 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ name: Release
on:
push:
branches:
# todo: change this branch name
- main
- develop

env:
BOT_NAME: nr-opensource-bot
Expand Down Expand Up @@ -111,7 +110,7 @@ jobs:
const result = await github.repos.updateBranchProtection({
owner: context.repo.owner,
repo: context.repo.repo,
branch: 'main',
branch: 'develop',
required_status_checks: null,
restrictions: null,
enforce_admins: null,
Expand All @@ -124,7 +123,7 @@ jobs:
uses: ad-m/[email protected]
with:
github_token: ${{ secrets.OPENSOURCE_BOT_TOKEN }}
branch: main
branch: develop

- name: Re-enable "required_pull_request_reviews" branch protection
id: enable-branch-protection
Expand All @@ -137,7 +136,7 @@ jobs:
const result = await github.repos.updateBranchProtection({
owner: context.repo.owner,
repo: context.repo.repo,
branch: 'main',
branch: 'develop',
required_status_checks: null,
restrictions: null,
enforce_admins: true,
Expand Down Expand Up @@ -187,7 +186,7 @@ jobs:
const result = await github.repos.updateBranchProtection({
owner: context.repo.owner,
repo: context.repo.repo,
branch: 'main',
branch: 'develop',
required_status_checks: null,
restrictions: null,
enforce_admins: null,
Expand Down Expand Up @@ -217,7 +216,7 @@ jobs:
const result = await github.repos.updateBranchProtection({
owner: context.repo.owner,
repo: context.repo.repo,
branch: 'main',
branch: 'develop',
required_status_checks: null,
restrictions: null,
enforce_admins: true,
Expand Down

0 comments on commit 45e22b7

Please sign in to comment.