Skip to content

Commit 34e1b56

Browse files
authored
make main as default branch (#1288)
## High Level Overview of Change Make `main` as default branch to avoid `staging` to `main` PR during release. This also helps removing all the users who have push to main access and all the commits go through pull request reviews before they are merged and released. <!-- Please include a summary/list of the changes. If too broad, please consider splitting into multiple PRs. --> ### Context of Change <!-- Please include the context of a change. If a bug fix, when was the bug introduced? What was the behavior? If a new feature, why was this architecture chosen? What were the alternatives? If a refactor, how is this better than the previous implementation? If there is a design document for this feature, please link it here. --> ### Type of Change <!-- Please check relevant options, delete irrelevant ones. --> - [ ] Bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds functionality) - [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected) - [ ] Refactor (non-breaking change that only restructures code) - [ ] Tests (You added tests for code that already exists, or your new feature included in this PR) - [ ] Documentation Updates - [ ] Translation Updates - [ ] Release ### Codebase Modernization <!-- In an effort to modernize the codebase, you should convert the files that you work with to React Hooks and TypeScript If this is not possible (e.g. it's too many changes, touching too many files, etc.) please explain why here. --> - [ ] Updated files to React Hooks - [ ] Updated files to TypeScript ## Before / After <!-- If just refactoring / back-end changes, this can be just an in-English description of the change at a technical level. If a UI change, screenshots should be included. --> ## Test Plan 1. Existing tests should pass. 2. CI should run and pass. 3. Force push on main should not be allowed. - Works - remote: - Changes must be made through a pull request. error: failed to push some refs to 'github.com:ripple/explorer.git' 4. Requires 2 approvals before merge into main. <!-- Please describe the tests that you ran to verify your changes and provide instructions so that others can reproduce. --> <!-- ## Future Tasks For future tasks related to PR. -->
1 parent 229b6fc commit 34e1b56

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

.github/workflows/nodejs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Explorer CI
22

33
on:
44
push:
5-
branches: [main, staging]
5+
branches: [main]
66
pull_request:
77
workflow_dispatch:
88

CONTRIBUTING.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,25 +30,25 @@ You need only to do this once and you have probably already done this if you alr
3030
### Clone the repository on your local machine.
3131

3232
```
33-
$ git clone [email protected]:username/explorer.git --branch staging
33+
$ git clone [email protected]:username/explorer.git --branch main
3434
$ cd explorer
3535
$ git remote add upstream [email protected]:ripple/explorer.git
3636
```
3737

3838
### Start work in a new branch.
3939

4040
```
41-
$ git fetch upstream staging
42-
$ git checkout staging
41+
$ git fetch upstream main
42+
$ git checkout main
4343
$ git checkout -b your-branch-name
4444
$ git push --set-upstream origin your-branch-name
4545
```
4646

47-
Bring in recent changes to the “staging” branch into your own branch
47+
Bring in recent changes to the “main” branch into your own branch
4848

4949
```
50-
$ git fetch upstream staging
51-
$ git pull upstream staging
50+
$ git fetch upstream main
51+
$ git pull upstream main
5252
```
5353

5454
### Ask to submit code from a branch of your GitHub fork.

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[![Release](https://img.shields.io/github/v/release/ripple/explorer.svg)](https://github.com/ripple/explorer/releases)
22
[![Build](https://github.com/ripple/explorer/actions/workflows/nodejs.yml/badge.svg)](https://github.com/ripple/explorer/actions)
3-
[![License](https://img.shields.io/github/license/ripple/explorer)](https://github.com/ripple/explorer/blob/staging/LICENSE)
3+
[![License](https://img.shields.io/github/license/ripple/explorer)](https://github.com/ripple/explorer/blob/main/LICENSE)
44

55
# XRPL Explorer
66

0 commit comments

Comments
 (0)