Prep for main as development branch
This commit is contained in:
2
.github/PULL_REQUEST_TEMPLATE.md
vendored
2
.github/PULL_REQUEST_TEMPLATE.md
vendored
@@ -16,7 +16,7 @@
|
|||||||
|
|
||||||
<!-- must be filled out completely to be considered for merging -->
|
<!-- must be filled out completely to be considered for merging -->
|
||||||
**Contributor Checklist**:
|
**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?
|
- [ ] Did you delete any extraneous prints/debugging code?
|
||||||
- [ ] (If applicable) Did you add documentation for the feature?
|
- [ ] (If applicable) Did you add documentation for the feature?
|
||||||
- [ ] (If applicable) Did you add a test demonstrating the PR?
|
- [ ] (If applicable) Did you add a test demonstrating the PR?
|
||||||
|
|||||||
28
.github/scripts/check-commit.sh
vendored
28
.github/scripts/check-commit.sh
vendored
@@ -49,12 +49,7 @@ search () {
|
|||||||
|
|
||||||
submodules=("cva6" "ibex" "boom" "gemmini" "hwacha" "icenet" "nvdla" "rocket-chip" "sha3" "sifive-blocks" "sifive-cache" "testchipip" "riscv-sodor")
|
submodules=("cva6" "ibex" "boom" "gemmini" "hwacha" "icenet" "nvdla" "rocket-chip" "sha3" "sifive-blocks" "sifive-cache" "testchipip" "riscv-sodor")
|
||||||
dir="generators"
|
dir="generators"
|
||||||
if [ "$CIRCLE_BRANCH" == "master" ] || [ "$CIRCLE_BRANCH" == "dev" ]
|
branches=("master" "main" "dev")
|
||||||
then
|
|
||||||
branches=("master" "main")
|
|
||||||
else
|
|
||||||
branches=("master" "main" "dev")
|
|
||||||
fi
|
|
||||||
search
|
search
|
||||||
|
|
||||||
submodules=("riscv-gnu-toolchain" "riscv-isa-sim" "riscv-pk" "riscv-tests")
|
submodules=("riscv-gnu-toolchain" "riscv-isa-sim" "riscv-pk" "riscv-tests")
|
||||||
@@ -81,22 +76,12 @@ search
|
|||||||
|
|
||||||
submodules=("coremark" "firemarshal" "nvdla-workload" "spec2017")
|
submodules=("coremark" "firemarshal" "nvdla-workload" "spec2017")
|
||||||
dir="software"
|
dir="software"
|
||||||
if [ "$CIRCLE_BRANCH" == "master" ] || [ "$CIRCLE_BRANCH" == "dev" ]
|
branches=("master" "dev")
|
||||||
then
|
|
||||||
branches=("master")
|
|
||||||
else
|
|
||||||
branches=("master" "dev")
|
|
||||||
fi
|
|
||||||
search
|
search
|
||||||
|
|
||||||
submodules=("DRAMSim2" "axe" "barstools" "chisel-testers" "dsptools" "rocket-dsp-utils" "torture")
|
submodules=("DRAMSim2" "axe" "barstools" "chisel-testers" "dsptools" "rocket-dsp-utils" "torture")
|
||||||
dir="tools"
|
dir="tools"
|
||||||
if [ "$CIRCLE_BRANCH" == "master" ] || [ "$CIRCLE_BRANCH" == "dev" ]
|
branches=("master" "dev")
|
||||||
then
|
|
||||||
branches=("master")
|
|
||||||
else
|
|
||||||
branches=("master" "dev")
|
|
||||||
fi
|
|
||||||
search
|
search
|
||||||
|
|
||||||
submodules=("dromajo-src")
|
submodules=("dromajo-src")
|
||||||
@@ -106,12 +91,7 @@ search
|
|||||||
|
|
||||||
submodules=("firesim")
|
submodules=("firesim")
|
||||||
dir="sims"
|
dir="sims"
|
||||||
if [ "$CIRCLE_BRANCH" == "master" ] || [ "$CIRCLE_BRANCH" == "dev" ]
|
branches=("master" "dev")
|
||||||
then
|
|
||||||
branches=("master")
|
|
||||||
else
|
|
||||||
branches=("master" "dev")
|
|
||||||
fi
|
|
||||||
search
|
search
|
||||||
|
|
||||||
submodules=("hammer")
|
submodules=("hammer")
|
||||||
|
|||||||
4
.github/workflows/chipyard-run-tests.yml
vendored
4
.github/workflows/chipyard-run-tests.yml
vendored
@@ -1,11 +1,9 @@
|
|||||||
name: chipyard-ci-process
|
name: chipyard-ci-process
|
||||||
|
|
||||||
on:
|
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:
|
pull_request:
|
||||||
branches:
|
branches:
|
||||||
- dev
|
|
||||||
- master
|
|
||||||
- main
|
- main
|
||||||
|
|
||||||
env:
|
env:
|
||||||
|
|||||||
Reference in New Issue
Block a user