Prep for main as development branch

This commit is contained in:
abejgonzalez
2022-02-14 20:19:48 -08:00
parent 22778880b5
commit 8eb07b193b
3 changed files with 6 additions and 28 deletions

View File

@@ -16,7 +16,7 @@
<!-- must be filled out completely to be considered for merging -->
**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?

View File

@@ -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")

View File

@@ -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: