From b8352a735b2966f28ce450dce6af0e4f6c565844 Mon Sep 17 00:00:00 2001 From: austinabell Date: Wed, 24 Jun 2020 11:23:44 -0400 Subject: [PATCH 1/2] Update default branch name --- .github/workflows/ci-rust.yml | 24 ++++++++++++------------ README.md | 4 ++-- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/ci-rust.yml b/.github/workflows/ci-rust.yml index 8fbaa177d559..a3d02ce23670 100644 --- a/.github/workflows/ci-rust.yml +++ b/.github/workflows/ci-rust.yml @@ -3,10 +3,10 @@ name: Rust CI on: push: branches: - - master + - main pull_request: branches: - - master + - main jobs: test: @@ -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 @@ -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: @@ -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 diff --git a/README.md b/README.md index fadb6e63cc96..9442590e0550 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@

-![](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) @@ -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). \ No newline at end of file +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). \ No newline at end of file From d030981bff60e776bc3be22251cf775db3884759 Mon Sep 17 00:00:00 2001 From: austinabell Date: Wed, 24 Jun 2020 11:31:11 -0400 Subject: [PATCH 2/2] remove extra spacing --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6c472f629fdf..010dfe4dad82 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -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: