From ced1f5e6b2f7cf703c3bcf369b0d3fe4bd37618c Mon Sep 17 00:00:00 2001 From: abejgonzalez Date: Fri, 2 Aug 2024 16:07:15 -0700 Subject: [PATCH 1/3] Update dependabot to also update GH-A workflows --- .github/dependabot.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index cad3d0199b..443b8d0d9e 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -16,3 +16,8 @@ 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: / From f2cbbe783eb56688ee9a8bb64e872b8c1643fbab Mon Sep 17 00:00:00 2001 From: abejgonzalez Date: Fri, 2 Aug 2024 16:11:13 -0700 Subject: [PATCH 2/3] Add label(s) to dependabot PRs --- .github/dependabot.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 443b8d0d9e..f55b10dc8f 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -8,6 +8,9 @@ updates: schedule: interval: "daily" directory: / + labels: + - "dependencies" + - "changelog:omit" # ignore certain submodules ignore: - dependency-name: "generators/gemmini" @@ -21,3 +24,6 @@ updates: schedule: interval: "daily" directory: / + labels: + - "dependencies" + - "changelog:omit" From 043c05d3e3509b7f86578da9ec589e6420dddd99 Mon Sep 17 00:00:00 2001 From: abejgonzalez Date: Fri, 2 Aug 2024 16:26:10 -0700 Subject: [PATCH 3/3] Remove need for secret.BUILDDIR in CI --- .github/CI_README.md | 9 +-------- .github/scripts/defaults.sh | 3 --- .github/workflows/chipyard-full-flow.yml | 2 +- .github/workflows/chipyard-run-tests.yml | 2 -- 4 files changed, 2 insertions(+), 14 deletions(-) diff --git a/.github/CI_README.md b/.github/CI_README.md index 30a9e96a4f..f9add9b5d2 100644 --- a/.github/CI_README.md +++ b/.github/CI_README.md @@ -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 diff --git a/.github/scripts/defaults.sh b/.github/scripts/defaults.sh index 0533846a16..5e448be447 100755 --- a/.github/scripts/defaults.sh +++ b/.github/scripts/defaults.sh @@ -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 diff --git a/.github/workflows/chipyard-full-flow.yml b/.github/workflows/chipyard-full-flow.yml index 50d0704d00..128fa1637a 100644 --- a/.github/workflows/chipyard-full-flow.yml +++ b/.github/workflows/chipyard-full-flow.yml @@ -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: diff --git a/.github/workflows/chipyard-run-tests.yml b/.github/workflows/chipyard-run-tests.yml index d86c75c907..c64deac7b3 100644 --- a/.github/workflows/chipyard-run-tests.yml +++ b/.github/workflows/chipyard-run-tests.yml @@ -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: