From 8eb07b193b412b3ceed7e94b5c6957feba5376cb Mon Sep 17 00:00:00 2001 From: abejgonzalez Date: Mon, 14 Feb 2022 20:19:48 -0800 Subject: [PATCH 1/3] Prep for main as development branch --- .github/PULL_REQUEST_TEMPLATE.md | 2 +- .github/scripts/check-commit.sh | 28 ++++-------------------- .github/workflows/chipyard-run-tests.yml | 4 +--- 3 files changed, 6 insertions(+), 28 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index b3c1c40f..e6c0c7d7 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -16,7 +16,7 @@ **Contributor Checklist**: -- [ ] Did you set `dev` as the base branch? +- [ ] Did you set `main` as the base branch? - [ ] Did you delete any extraneous prints/debugging code? - [ ] (If applicable) Did you add documentation for the feature? - [ ] (If applicable) Did you add a test demonstrating the PR? diff --git a/.github/scripts/check-commit.sh b/.github/scripts/check-commit.sh index e056921d..f7d94189 100755 --- a/.github/scripts/check-commit.sh +++ b/.github/scripts/check-commit.sh @@ -49,12 +49,7 @@ search () { submodules=("cva6" "ibex" "boom" "gemmini" "hwacha" "icenet" "nvdla" "rocket-chip" "sha3" "sifive-blocks" "sifive-cache" "testchipip" "riscv-sodor") dir="generators" -if [ "$CIRCLE_BRANCH" == "master" ] || [ "$CIRCLE_BRANCH" == "dev" ] -then - branches=("master" "main") -else - branches=("master" "main" "dev") -fi +branches=("master" "main" "dev") search submodules=("riscv-gnu-toolchain" "riscv-isa-sim" "riscv-pk" "riscv-tests") @@ -81,22 +76,12 @@ search submodules=("coremark" "firemarshal" "nvdla-workload" "spec2017") dir="software" -if [ "$CIRCLE_BRANCH" == "master" ] || [ "$CIRCLE_BRANCH" == "dev" ] -then - branches=("master") -else - branches=("master" "dev") -fi +branches=("master" "dev") search submodules=("DRAMSim2" "axe" "barstools" "chisel-testers" "dsptools" "rocket-dsp-utils" "torture") dir="tools" -if [ "$CIRCLE_BRANCH" == "master" ] || [ "$CIRCLE_BRANCH" == "dev" ] -then - branches=("master") -else - branches=("master" "dev") -fi +branches=("master" "dev") search submodules=("dromajo-src") @@ -106,12 +91,7 @@ search submodules=("firesim") dir="sims" -if [ "$CIRCLE_BRANCH" == "master" ] || [ "$CIRCLE_BRANCH" == "dev" ] -then - branches=("master") -else - branches=("master" "dev") -fi +branches=("master" "dev") search submodules=("hammer") diff --git a/.github/workflows/chipyard-run-tests.yml b/.github/workflows/chipyard-run-tests.yml index 245bfd74..b6193c5f 100644 --- a/.github/workflows/chipyard-run-tests.yml +++ b/.github/workflows/chipyard-run-tests.yml @@ -1,11 +1,9 @@ name: chipyard-ci-process on: - # run ci on pull requests targeting dev, master, main only (since the ci runs on the merge commit) + # run ci on pull requests targeting main only (since the ci runs on the merge commit) pull_request: branches: - - dev - - master - main env: From 4b8ea25a863922024cb2562a221b1b4b9a23a82e Mon Sep 17 00:00:00 2001 From: abejgonzalez Date: Tue, 15 Feb 2022 09:22:51 -0800 Subject: [PATCH 2/3] Update .md's [ci skip] --- CONTRIBUTING.md | 6 +++--- README.md | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 1f523835..40dfb4fa 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -3,6 +3,6 @@ Contributing to Chipyard ### Branch management: -1) github:com/ucb-bar/chipyard: master = stable release. All merges to master must go through PR. -2) github:com/ucb-bar/chipyard: dev = pre-release non-stable branch with latest features. All merges to dev must go through PR. -3) Other dependencies pointed at by Chipyard (e.g. firesim, boom): master should be the version submoduled in ucb-bar/chipyard master. +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. +3) Other dependencies pointed at by Chipyard (e.g. firesim, boom): master/main should be the version submoduled in ucb-bar/chipyard main. diff --git a/README.md b/README.md index b523dfae..1f23c6f5 100644 --- a/README.md +++ b/README.md @@ -4,13 +4,13 @@ ## Quick Links -* **DOCUMENTATION**: https://chipyard.readthedocs.io/ +* **STABLE DOCUMENTATION**: https://chipyard.readthedocs.io/ * **USER QUESTION FORUM**: https://groups.google.com/forum/#!forum/chipyard * **BUGS AND FEATURE-REQUESTS**: https://github.com/ucb-bar/chipyard/issues ## Using Chipyard -To get started using Chipyard, see the documentation on the Chipyard documentation site: https://chipyard.readthedocs.io/ +To get started using Chipyard, see the stable documentation on the Chipyard documentation site: https://chipyard.readthedocs.io/ ## What is Chipyard @@ -22,7 +22,7 @@ Chipyard is actively developed in the [Berkeley Architecture Research Group][ucb ## Resources -* Chipyard Documentation: https://chipyard.readthedocs.io/ +* Chipyard Stable Documentation: https://chipyard.readthedocs.io/ * Chipyard (x FireSim) Tutorial: https://fires.im/tutorial * Chipyard Basics slides: https://fires.im/micro21-slides-pdf/02_chipyard_basics.pdf * Chipyard Tutorial Exercise slides: https://fires.im/micro21-slides-pdf/03_building_custom_socs.pdf From 2a4877f82170815978c46242d89653ab45e46305 Mon Sep 17 00:00:00 2001 From: abejgonzalez Date: Tue, 15 Feb 2022 22:44:18 -0800 Subject: [PATCH 3/3] Add main for FireSim --- .github/scripts/check-commit.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/scripts/check-commit.sh b/.github/scripts/check-commit.sh index 5cf5744d..e646fcb8 100755 --- a/.github/scripts/check-commit.sh +++ b/.github/scripts/check-commit.sh @@ -93,7 +93,7 @@ search submodules=("firesim") dir="sims" -branches=("master" "dev") +branches=("master" "main" "dev") search submodules=("hammer")