Skip to content

Commit

Permalink
fix: update master to main
Browse files Browse the repository at this point in the history
  • Loading branch information
Joel Worrall committed Sep 2, 2020
1 parent 0b7f010 commit 01ab116
Show file tree
Hide file tree
Showing 8 changed files with 478 additions and 231 deletions.
5 changes: 2 additions & 3 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,10 @@ name: Pull Request
on:
pull_request:
branches:
- master
- develop
- main

repository_dispatch:
types: [pull-request-develop, pull-request-master]
types: [pull-request]

jobs:
checkout-and-build-pr:
Expand Down
24 changes: 13 additions & 11 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: CI
on:
push:
branches:
- develop
- main
repository_dispatch:
types: [semantic-release]

Expand Down Expand Up @@ -49,11 +49,13 @@ jobs:
runs-on: ubuntu-latest
needs: job-checkout-and-build
steps:
# Checkout fetch-depth: 2 because there's a check to see if package.json
# was updated, and need at least 2 commits for the check to function properly
- name: Checkout repo
uses: actions/checkout@v2
with:
fetch-depth: 2

# Probably not necessary since the ubuntu-latest image would have latest Node LTS release
# and nothing in this job _needs_ older Node
- name: Setup Node.js
uses: actions/setup-node@v1
with:
Expand Down Expand Up @@ -118,7 +120,7 @@ jobs:
const result = await github.repos.updateBranchProtection({
owner: context.repo.owner,
repo: context.repo.repo,
branch: 'develop',
branch: 'main',
required_status_checks: null,
restrictions: null,
enforce_admins: null,
Expand All @@ -131,7 +133,7 @@ jobs:
uses: ad-m/github-push-action@v0.6.0
with:
github_token: ${{ secrets.OPENSOURCE_BOT_TOKEN }}
branch: develop
branch: main

- name: Re-enable "required_pull_request_reviews" branch protection
id: enable-branch-protection
Expand All @@ -144,7 +146,7 @@ jobs:
const result = await github.repos.updateBranchProtection({
owner: context.repo.owner,
repo: context.repo.repo,
branch: 'develop',
branch: 'main',
required_status_checks: null,
restrictions: null,
enforce_admins: null,
Expand All @@ -158,12 +160,12 @@ jobs:
runs-on: ubuntu-latest
needs: [job-checkout-and-build, job-generate-third-party-notices]
steps:
# Checkout ref: develop because previous job committed third_party_notices and
# we need to checkout develop to pick up that commit
# Checkout ref: main because previous job committed third_party_notices and
# we need to checkout main to pick up that commit
- name: Checkout repo
uses: actions/checkout@v2
with:
ref: develop
ref: main

- name: Setup Node.js
uses: actions/setup-node@v1
Expand Down Expand Up @@ -195,7 +197,7 @@ jobs:
const result = await github.repos.updateBranchProtection({
owner: context.repo.owner,
repo: context.repo.repo,
branch: 'develop',
branch: 'main',
required_status_checks: null,
restrictions: null,
enforce_admins: null,
Expand Down Expand Up @@ -225,7 +227,7 @@ jobs:
const result = await github.repos.updateBranchProtection({
owner: context.repo.owner,
repo: context.repo.repo,
branch: 'develop',
branch: 'main',
required_status_checks: null,
restrictions: null,
enforce_admins: null,
Expand Down
4 changes: 2 additions & 2 deletions .releaserc
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"branches": ["develop"],
"branches": ["main"],
"plugins": [
"@semantic-release/commit-analyzer",
"@semantic-release/release-notes-generator",
Expand All @@ -17,4 +17,4 @@
],
"dryRun": false,
"debug": true
}
}
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Contributing

Contributions are always welcome. Before contributing please read the
[code of conduct](./CODE_OF_CONDUCT.md) and [search the issue tracker](issues); your issue may have already been discussed or fixed in `develop` or `master`. To contribute,
[code of conduct](./CODE_OF_CONDUCT.md) and [search the issue tracker](issues); your issue may have already been discussed or fixed in `main`. To contribute,
[fork](https://help.github.com/articles/fork-a-repo/) this repository, commit your changes, and [send a Pull Request](https://help.github.com/articles/using-pull-requests/).

Note that our [code of conduct](./CODE_OF_CONDUCT.md) applies to all platforms and venues related to this project; please follow it in all your interactions with the project and its participants.
Expand Down
6 changes: 6 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,12 @@ Please do not report issues with Datalyzer to New Relic Global Technical Support
Issues and enhancement requests can be submitted in the [Issues tab of this repository](../../issues). Please search for and review the existing open issues before submitting a new issue.
## Security
As noted in our [security policy](https://github.com/newrelic/nr1-datalyzer/security/policy), New Relic is committed to the privacy and security of our customers and their data. We believe that providing coordinated disclosure by security researchers and engaging with the security community are important means to achieve our security goals.
If you believe you have found a security vulnerability in this project or any of New Relic's products or websites, we welcome and greatly appreciate you reporting it to New Relic through [HackerOne](https://hackerone.com/newrelic).
## Contributing
Contributions are welcome (and if you submit a Enhancement Request, expect to be invited to contribute it yourself :grin:). Please review our [Contributors Guide](./CONTRIBUTING.md).
Expand Down
4 changes: 2 additions & 2 deletions catalog/documentation.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Using Datalyzer from a Service, Mobile or Browser application limits the events,

## Open Source License

This project is distributed under the [Apache 2 license](https://github.com/newrelic/nr1-datalyzer/blob/master/LICENSE).
This project is distributed under the [Apache 2 license](https://github.com/newrelic/nr1-datalyzer/blob/main/LICENSE).

## Dependencies

Expand Down Expand Up @@ -73,6 +73,6 @@ Issues and enhancement requests can be submitted in the [Issues tab of this repo
## Contributing
Contributions are welcome (and if you submit a Enhancement Request, expect to be invited to contribute it yourself :grin:). Please review our [Contributors Guide](https://github.com/newrelic/nr1-datalyzer/blob/master/CONTRIBUTING.md).
Contributions are welcome (and if you submit a Enhancement Request, expect to be invited to contribute it yourself :grin:). Please review our [Contributors Guide](https://github.com/newrelic/nr1-datalyzer/blob/main/CONTRIBUTING.md).
Keep in mind that when you submit your pull request, you'll need to sign the CLA via the click-through using CLA-Assistant. If you'd like to execute our corporate CLA, or if you have any questions, please drop us an email at opensource+nr1-datalyzer@newrelic.com.
Loading

0 comments on commit 01ab116

Please sign in to comment.