From 7e1d89adc10030e9656e22971316d944b722ca86 Mon Sep 17 00:00:00 2001 From: abejgonzalez Date: Tue, 15 Feb 2022 22:52:50 -0800 Subject: [PATCH 1/3] Small update to CONTRIB.md to run CI --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 40dfb4fa..4b602be7 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -4,5 +4,5 @@ Contributing to Chipyard ### Branch management: 1) github:com/ucb-bar/chipyard: main = pre-release non-stable branch with latest features. All merges to main must go through PR. -2) github:com/ucb-bar/chipyard: specific tag = official chipyard release. +2) github:com/ucb-bar/chipyard: specific tag / tagged branch = official chipyard release. 3) Other dependencies pointed at by Chipyard (e.g. firesim, boom): master/main should be the version submoduled in ucb-bar/chipyard main. From ff0eae287d92544095d58ec85f3646da74d8b496 Mon Sep 17 00:00:00 2001 From: abejgonzalez Date: Tue, 15 Feb 2022 23:16:09 -0800 Subject: [PATCH 2/3] Update check-commit.sh in CI to properly checkout remote branches --- .github/scripts/check-commit.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/scripts/check-commit.sh b/.github/scripts/check-commit.sh index e646fcb8..ec9e73db 100755 --- a/.github/scripts/check-commit.sh +++ b/.github/scripts/check-commit.sh @@ -25,6 +25,8 @@ search_submodule() { # Initialize submodule and get the hashes git submodule update --init $dir/$submodule git -C $dir/$submodule fetch --unshallow + git -C $dir/$submodule config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*" + git -C $dir/$submodule fetch origin status=$(git submodule status) hash=$(echo "$status" | grep "$dir.*$submodule " | awk '{print$1}' | grep -o "[[:alnum:]]*") From dd86b0dbc77af6232945f398abdd6b02144c13b1 Mon Sep 17 00:00:00 2001 From: abejgonzalez Date: Tue, 15 Feb 2022 23:44:18 -0800 Subject: [PATCH 3/3] Update status badge | Don't error on warning readthedocs --- .readthedocs.yml | 1 - README.md | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.readthedocs.yml b/.readthedocs.yml index 51959f5a..4c894485 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -9,7 +9,6 @@ formats: all sphinx: configuration: docs/conf.py - fail_on_warning: true python: install: diff --git a/README.md b/README.md index 1f23c6f5..8b125cf4 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ ![CHIPYARD](https://github.com/ucb-bar/chipyard/raw/master/docs/_static/images/chipyard-logo-full.png) -# Chipyard Framework [![Test](https://github.com/ucb-bar/chipyard/workflows/chipyard-ci-process/badge.svg?style=svg)](https://github.com/ucb-bar/chipyard/actions) +# Chipyard Framework [![Test](https://github.com/ucb-bar/chipyard/actions/workflows/chipyard-run-tests.yml/badge.svg)](https://github.com/ucb-bar/chipyard/actions) ## Quick Links