Skip to content

Commit 0841ad1

Browse files
authored
Merge pull request #1544 from ucb-bar/conda-bump
Bump Conda + Deprecate docker image docs
2 parents 6a3e3d9 + adcb736 commit 0841ad1

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

.github/scripts/install-conda.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
export HOME="${HOME:-/root}"
44

55
CONDA_INSTALL_PREFIX=/opt/conda
6-
CONDA_INSTALLER_VERSION=22.11.1-4
6+
CONDA_INSTALLER_VERSION=23.1.0-1
77
CONDA_INSTALLER="https://github.com/conda-forge/miniforge/releases/download/${CONDA_INSTALLER_VERSION}/Miniforge3-${CONDA_INSTALLER_VERSION}-Linux-x86_64.sh"
88
CONDA_CMD="conda" # some installers install mamba or micromamba
99

docs/Chipyard-Basics/Initial-Repo-Setup.rst

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -72,25 +72,25 @@ Run the following script based off which compiler you would like to use.
7272

7373
.. Warning:: The following script will complete a "full" installation of Chipyard which may take a long time depending on the system.
7474
Ensure that this script completes fully (no interruptions) before continuing on. User can use the ``--skip`` or ``-s`` flag to skip steps:
75-
75+
7676
``-s 1`` skips initializing Conda environment
77-
77+
7878
``-s 2`` skips initializing Chipyard submodules
79-
79+
8080
``-s 3`` skips initializing toolchain collateral (Spike, PK, tests, libgloss)
81-
81+
8282
``-s 4`` skips initializing ctags
83-
83+
8484
``-s 5`` skips pre-compiling Chipyard Scala sources
85-
85+
8686
``-s 6`` skips initializing FireSim
87-
87+
8888
``-s 7`` skips pre-compiling FireSim sources
89-
89+
9090
``-s 8`` skips initializing FireMarshal
91-
91+
9292
``-s 9`` skips pre-compiling FireMarshal default buildroot Linux sources
93-
93+
9494
``-s 10`` skips running repository clean-up
9595

9696
.. code-block:: shell
@@ -140,7 +140,7 @@ You can source this file in your ``.bashrc`` or equivalent environment setup fil
140140
However, it is recommended that the final ``env.sh`` file sourced is the ``env.sh`` located in the
141141
Chipyard repo that you expect to run ``make`` commands in.
142142

143-
Pre-built Docker Image
143+
DEPRECATED: Pre-built Docker Image
144144
-------------------------------------------
145145

146146
An alternative to setting up the Chipyard repository locally is to pull the pre-built Docker image from Docker Hub. The image comes with all dependencies installed, Chipyard cloned, and toolchains initialized. This image sets up baseline Chipyard (not including FireMarshal, FireSim, and Hammer initializations). Each image comes with a tag that corresponds to the version of Chipyard cloned/set-up in that image. Not including a tag during the pull will pull the image with the latest version of Chipyard.

0 commit comments

Comments
 (0)