Skip to content

Commit

Permalink
Merge pull request #1950 from ucb-bar/update-dependabot-for-gha
Browse files Browse the repository at this point in the history
Update dependabot to also update GH-A workflows
  • Loading branch information
abejgonzalez authored Aug 2, 2024
2 parents 27a3f9a + 043c05d commit 9460916
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 14 deletions.
9 changes: 1 addition & 8 deletions .github/CI_README.md
Original file line number Diff line number Diff line change
Expand Up @@ -95,18 +95,11 @@ This stores all collateral for the tests (srcs, generated-srcs, sim binary, etc)
Other CI Setup
--------------

To get the CI to work correctly you need to create the following GH Repository Secrets

| Secret | Value |
| -------| ------------- |
| BUILDDIR | the directory to use on the build server |

Additionally, you need to install conda on the build servers that exist.
You need to install conda on the build servers that exist.

Notes on CIRCLE CI
------------------
This code is heavily based on the origin [CircleCI]() work. There a quite a few differences
- CCI supports workflow level variables, in GA we must define things like `BUILDSERVER: ${{ secrets.BUILDSERVER }}` in every job
- CCI allows a much larger cache. The entire CY directory with toolchains and RTL could be cached, with GA there is a 5Gb total cache limit
- GA support more parallel jobs 20 vs 4
- GA seems to allow much longer run times
11 changes: 11 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ updates:
schedule:
interval: "daily"
directory: /
labels:
- "dependencies"
- "changelog:omit"
# ignore certain submodules
ignore:
- dependency-name: "generators/gemmini"
Expand All @@ -16,3 +19,11 @@ updates:
- dependency-name: "generators/rocket-chip-inclusive-cache"
- dependency-name: "toolchains/riscv-tools/riscv-tests"
- dependency-name: "toolchains/riscv-tools/riscv-tools-feedstock"
# submit a PR for bumping GH-A dependencies
- package-ecosystem: github-actions
schedule:
interval: "daily"
directory: /
labels:
- "dependencies"
- "changelog:omit"
3 changes: 0 additions & 3 deletions .github/scripts/defaults.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@ CI_MAKE_NPROC=8
REMOTE_MAKE_NPROC=4

# remote variables
# CI_DIR is defined externally based on the GH repository secret BUILDDIR

REMOTE_PREFIX=$CI_DIR/${GITHUB_REPOSITORY#*/}-${GITHUB_REF_NAME//\//-}
REMOTE_WORK_DIR=$GITHUB_WORKSPACE
REMOTE_CHIPYARD_DIR=$GITHUB_WORKSPACE
REMOTE_SIM_DIR=$REMOTE_CHIPYARD_DIR/sims/verilator
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/chipyard-full-flow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ defaults:
shell: bash -leo pipefail {0}

env:
REMOTE_WORK_DIR: ${{ secrets.BUILDDIR }}/cy-ci-shared/cy-${{ github.sha }}
REMOTE_WORK_DIR: /tmp/cy-ci-shared/cy-${{ github.sha }}
JAVA_TMP_DIR: /tmp/cy-${{ github.sha }}-full

jobs:
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/chipyard-run-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,9 @@ defaults:

env:
tools-cache-version: v17
CI_DIR: ${{ secrets.BUILDDIR }}
JVM_OPTS: -Xmx3200m # Customize the JVM maximum heap limit
conda-env-name-no-time: cy-${{ github.run_id }}
workflow-timestamp: ${{ github.event.pull_request.updated_at }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

jobs:
cancel-prior-workflows:
Expand Down

0 comments on commit 9460916

Please sign in to comment.