Skip to content

Commit

Permalink
Update default branch name to main (#519)
Browse files Browse the repository at this point in the history
* Update default branch name

* remove extra spacing
  • Loading branch information
austinabell authored Jun 24, 2020
1 parent 2650f8e commit f68ae5d
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ commands:
echo 'export IMAGE_NAME=forest' >> $BASH_ENV
echo 'export CARGO_INCREMENTAL=0' >> $BASH_ENV
echo 'export CI_TIMEOUT="timeout 40m"' >> $BASH_ENV
echo 'export CC=gcc' >> $BASH_ENV
echo 'export CC=gcc' >> $BASH_ENV
install_deps:
steps:
- run:
Expand Down
24 changes: 12 additions & 12 deletions .github/workflows/ci-rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ name: Rust CI
on:
push:
branches:
- master
- main
pull_request:
branches:
- master
- main

jobs:
test:
Expand All @@ -24,13 +24,13 @@ jobs:
- name: Install Protoc
uses: arduino/setup-protoc@master
with:
version: '3.9.1'
version: "3.9.1"

- name: Toolchain setup
uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: stable
with:
profile: minimal
toolchain: stable
override: true

- name: Cargo Build Tests
Expand Down Expand Up @@ -68,15 +68,15 @@ jobs:
steps:
- uses: actions/checkout@v2
with:
submodules: 'recursive'
submodules: "recursive"

- name: Install OpenCL
run: sudo apt install ocl-icd-opencl-dev
run: sudo apt install ocl-icd-opencl-dev

- name: Install Protoc
uses: arduino/setup-protoc@master
with:
version: '3.9.1'
version: "3.9.1"

- uses: actions-rs/toolchain@v1
with:
Expand Down Expand Up @@ -105,18 +105,18 @@ jobs:
steps:
- uses: actions/checkout@v2
with:
submodules: 'recursive'
submodules: "recursive"

- name: Install Rust
run: rustup update beta && rustup default beta

- name: Install OpenCL
run: sudo apt install ocl-icd-opencl-dev

- name: Install Protoc
uses: arduino/setup-protoc@master
with:
version: '3.9.1'
version: "3.9.1"

- name: Build documentation
run: cargo doc --no-deps --all-features
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
</p>


![](https://github.com/ChainSafe/forest/workflows/Rust%20CI/badge.svg?event=push&branch=master)
![](https://github.com/ChainSafe/forest/workflows/Rust%20CI/badge.svg?event=push&branch=main)
[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
[![Discord](https://img.shields.io/discord/593655374469660673.svg?label=Discord&logo=discord)](https://discord.gg/Q6A3YA2)
Expand Down Expand Up @@ -93,4 +93,4 @@ https://chainsafe.github.io/forest/
- Have questions? Say hi on [Discord](https://discord.gg/Q6A3YA2)!

## License
Forest is dual licensed under [MIT](https://github.com/ChainSafe/forest/blob/master/LICENSE-MIT) + [Apache 2.0](https://github.com/ChainSafe/forest/blob/master/LICENSE-APACHE).
Forest is dual licensed under [MIT](https://github.com/ChainSafe/forest/blob/main/LICENSE-MIT) + [Apache 2.0](https://github.com/ChainSafe/forest/blob/main/LICENSE-APACHE).

0 comments on commit f68ae5d

Please sign in to comment.