wu-arch/chipyard
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Always install spike/libgloss in gh-actions

Browse Source
This commit is contained in:
Jerry Zhao
2023-01-06 16:48:04 -08:00
parent 15c9207aec
commit 4f6e48ce88
2 changed files with 7 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
.github/actions/create-conda-env/action.yml vendored
View File

@@ -1,11 +1,5 @@
name: create-conda-env name: create-conda-env
description: 'Create conda environments if they dont exist' description: 'Create conda environments if they dont exist'
inputs:
install-collateral:
description: 'Install Spike/Libgloss/etc'
required: false
default: true
runs: runs:
using: "composite" using: "composite"
steps: steps:
@@ -20,7 +14,6 @@ runs:
conda-lock install -n ${{ env.conda-env-name-no-time }}-$(date --date "${{ env.workflow-timestamp }}" +%Y%m%d)-esp-tools ./conda-reqs/conda-lock-reqs/conda-requirements-esp-tools-linux-64.conda-lock.yml conda-lock install -n ${{ env.conda-env-name-no-time }}-$(date --date "${{ env.workflow-timestamp }}" +%Y%m%d)-esp-tools ./conda-reqs/conda-lock-reqs/conda-requirements-esp-tools-linux-64.conda-lock.yml
conda deactivate conda deactivate
if [[ "${{ inputs.install-collateral }}" == 'true' ]]; then
echo "Add extra toolchain collateral to RISC-V install area" echo "Add extra toolchain collateral to RISC-V install area"
conda activate ${{ env.conda-env-name-no-time }}-$(date --date "${{ env.workflow-timestamp }}" +%Y%m%d)-riscv-tools conda activate ${{ env.conda-env-name-no-time }}-$(date --date "${{ env.workflow-timestamp }}" +%Y%m%d)-riscv-tools
./scripts/build-toolchain-extra.sh riscv-tools -p $CONDA_PREFIX/riscv-tools ./scripts/build-toolchain-extra.sh riscv-tools -p $CONDA_PREFIX/riscv-tools
@@ -29,5 +22,4 @@ runs:
./scripts/build-toolchain-extra.sh esp-tools -p $CONDA_PREFIX/esp-tools ./scripts/build-toolchain-extra.sh esp-tools -p $CONDA_PREFIX/esp-tools
conda deactivate conda deactivate
fi fi
fi
shell: bash -leo pipefail {0} shell: bash -leo pipefail {0}

6
.github/workflows/chipyard-run-tests.yml vendored
View File

@@ -83,8 +83,6 @@ jobs:
uses: ./.github/actions/git-workaround uses: ./.github/actions/git-workaround
- name: Create conda env - name: Create conda env
uses: ./.github/actions/create-conda-env uses: ./.github/actions/create-conda-env
with:
install-collateral: false
- name: Check commits of each submodule - name: Check commits of each submodule
run: | run: |
conda activate ${{ env.conda-env-name-no-time }}-$(date --date "${{ env.workflow-timestamp }}" +%Y%m%d)-riscv-tools conda activate ${{ env.conda-env-name-no-time }}-$(date --date "${{ env.workflow-timestamp }}" +%Y%m%d)-riscv-tools
@@ -111,8 +109,6 @@ jobs:
uses: ./.github/actions/git-workaround uses: ./.github/actions/git-workaround
- name: Create conda env - name: Create conda env
uses: ./.github/actions/create-conda-env uses: ./.github/actions/create-conda-env
with:
install-collateral: false
- name: Check that the tutorial-setup patches apply - name: Check that the tutorial-setup patches apply
run: | run: |
conda activate ${{ env.conda-env-name-no-time }}-$(date --date "${{ env.workflow-timestamp }}" +%Y%m%d)-riscv-tools conda activate ${{ env.conda-env-name-no-time }}-$(date --date "${{ env.workflow-timestamp }}" +%Y%m%d)-riscv-tools
@@ -138,8 +134,6 @@ jobs:
uses: ./.github/actions/git-workaround uses: ./.github/actions/git-workaround
- name: Create conda env - name: Create conda env
uses: ./.github/actions/create-conda-env uses: ./.github/actions/create-conda-env
with:
install-collateral: false
- name: Check that documentation builds with no warnings/errors - name: Check that documentation builds with no warnings/errors
run: | run: |
conda activate ${{ env.conda-env-name-no-time }}-$(date --date "${{ env.workflow-timestamp }}" +%Y%m%d)-riscv-tools conda activate ${{ env.conda-env-name-no-time }}-$(date --date "${{ env.workflow-timestamp }}" +%Y%m%d)-riscv-tools