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

Fix CI (proper use of CONDA_PREFIX + GH token)

Browse Source
This commit is contained in:
abejgonzalez
2023-12-01 10:11:13 -08:00
parent dae66b0d56
commit dd6cff58a6
2 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,21 +14,25 @@ runs:
conda-lock install --conda $(which conda) -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 --conda $(which conda) -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
echo "Add extra toolchain collateral to RISC-V install area" echo "Add extra toolchain collateral + CIRCT to RISC-V install area"
git submodule update --init ./conda-reqs/install-circt
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
conda deactivate
conda activate ${{ env.conda-env-name-no-time }}-$(date --date "${{ env.workflow-timestamp }}" +%Y%m%d)-esp-tools
./scripts/build-toolchain-extra.sh esp-tools -p $CONDA_PREFIX/esp-tools
conda deactivate
echo "Installing CIRCT to conda area"
git submodule update --init ./conda-reqs/install-circt
./conda-reqs/install-circt/bin/download-release-or-nightly-circt.sh \ ./conda-reqs/install-circt/bin/download-release-or-nightly-circt.sh \
-f circt-full-shared-linux-x64.tar.gz \ -f circt-full-shared-linux-x64.tar.gz \
-i $CONDA_PREFIX \ -i $CONDA_PREFIX \
-v version-file \ -v version-file \
-x ./conda-reqs/circt.json \ -x ./conda-reqs/circt.json \
-g null -g ${{ github.token }}
conda deactivate
conda activate ${{ env.conda-env-name-no-time }}-$(date --date "${{ env.workflow-timestamp }}" +%Y%m%d)-esp-tools
./scripts/build-toolchain-extra.sh esp-tools -p $CONDA_PREFIX/esp-tools
./conda-reqs/install-circt/bin/download-release-or-nightly-circt.sh \
-f circt-full-shared-linux-x64.tar.gz \
-i $CONDA_PREFIX \
-v version-file \
-x ./conda-reqs/circt.json \
-g ${{ github.token }}
conda deactivate
fi fi
shell: bash -leo pipefail {0} shell: bash -leo pipefail {0}

1
scripts/build-setup.sh
View File

@@ -148,7 +148,6 @@ if run_step "1"; then
# use conda-lock to create env # use conda-lock to create env
conda-lock install --conda $(which conda) -p $CYDIR/.conda-env $LOCKFILE && conda-lock install --conda $(which conda) -p $CYDIR/.conda-env $LOCKFILE &&
source $CYDIR/.conda-env/etc/profile.d/conda.sh && source $CYDIR/.conda-env/etc/profile.d/conda.sh &&
conda activate $CYDIR/.conda-env conda activate $CYDIR/.conda-env
exit_if_last_command_failed exit_if_last_command_failed