Skip to content

Commit 125d9b9

Browse files
committed
Revert "ci: disable install software during ci"
This reverts commit 146885a.
1 parent 146885a commit 125d9b9

1 file changed

Lines changed: 23 additions & 23 deletions

File tree

.gitlab-ci.yml

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,10 @@ build_doc:
4747
- NMSIS/doc/build
4848
expire_in: 2 day
4949
before_script:
50-
#- apt update
51-
#- apt install -y doxygen python3 make latexmk texlive-base texlive-latex-extra python3-pip
52-
#- pip3 config set global.index-url https://pypi.tuna.tsinghua.edu.cn/simple
53-
#- pip3 install -r NMSIS/doc/requirements.txt
50+
- apt update
51+
- apt install -y doxygen python3 make latexmk texlive-base texlive-latex-extra python3-pip
52+
- pip3 config set global.index-url https://pypi.tuna.tsinghua.edu.cn/simple
53+
- pip3 install -r NMSIS/doc/requirements.txt
5454
script:
5555
- cd NMSIS/doc
5656
- make clean
@@ -80,9 +80,9 @@ build_library:
8080
variables:
8181
PARALLEL_OPTS: "-j8"
8282
script:
83-
#- apt update
84-
#- apt install -y python3 python3-pip
85-
#- pip3 install prettytable
83+
- apt update
84+
- apt install -y python3 python3-pip
85+
- pip3 install prettytable
8686
- cd NMSIS
8787
- echo "Generate NMSIS Library for Nuclei RISC-V Processors"
8888
- make gen | grep -E "^Build\ Library|^\+|^\|"
@@ -113,9 +113,9 @@ build_library_terapines:
113113
- NMSIS/build_terapines.log
114114
expire_in: 2 day
115115
script:
116-
#- apt update
117-
#- apt install -y python3 python3-pip
118-
#- pip3 install prettytable
116+
- apt update
117+
- apt install -y python3 python3-pip
118+
- pip3 install prettytable
119119
- cd NMSIS
120120
- echo "Setup Zcc toolchain PATH"
121121
- export PATH=/home/share/devtools/zcc/linux64/latest/bin/:$PATH
@@ -148,9 +148,9 @@ build_align_library:
148148
- NMSIS/build.log
149149
expire_in: 2 day
150150
script:
151-
#- apt update
152-
#- apt install -y python3 python3-pip
153-
#- pip3 install prettytable
151+
- apt update
152+
- apt install -y python3 python3-pip
153+
- pip3 install prettytable
154154
- cd NMSIS
155155
- echo "Generate NMSIS Library(Memory access without unalign R/W) for Nuclei RISC-V Processors"
156156
- make gen_unalign > build.log 2>&1
@@ -171,19 +171,19 @@ build_align_library:
171171
- lscpu
172172
# prepare for docker ssh environment
173173
## https://docs.gitlab.com/ee/ci/ssh_keys/#ssh-keys-when-using-the-docker-executor
174-
#- apt update
175-
#- command -v ssh-agent >/dev/null || ( apt-get update -y && apt-get install openssh-client -y )
174+
- apt update
175+
- command -v ssh-agent >/dev/null || ( apt-get update -y && apt-get install openssh-client -y )
176176
- eval $(ssh-agent -s)
177177
- mkdir -p ~/.ssh
178178
- chmod 700 ~/.
179179
- echo "$SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add -
180180
# important: need to avoid git ssh asking yes/no when clone
181181
# https://serverfault.com/questions/469052/ssh-failing-from-script-working-on-command-line-git
182182
- ssh-keyscan gito > ~/.ssh/known_hosts
183-
#- apt install -y python3 python3-pip ruby
184-
#- pip3 config set global.index-url https://pypi.tuna.tsinghua.edu.cn/simple
185-
#- python3 -m pip install --upgrade pip
186-
#- pip3 install prettytable==2.1.0 psutil==5.8.0 pyserial==3.5 markdown
183+
- apt install -y python3 python3-pip ruby
184+
- pip3 config set global.index-url https://pypi.tuna.tsinghua.edu.cn/simple
185+
- python3 -m pip install --upgrade pip
186+
- pip3 install prettytable==2.1.0 psutil==5.8.0 pyserial==3.5 markdown
187187
- export SDK_COPY_OBJECTS="elf,map"
188188
dependencies:
189189
- build_library
@@ -203,7 +203,7 @@ test_nn_library:
203203
script:
204204
- git clone -b $SDK_BRANCH $NUCLEI_SDK NMSIS/nuclei_sdk
205205
- export NUCLEI_SDK_ROOT=$(readlink -f NMSIS/nuclei_sdk)
206-
#- pip3 install -r $NUCLEI_SDK_ROOT/tools/scripts/requirements.txt
206+
- pip3 install -r $NUCLEI_SDK_ROOT/tools/scripts/requirements.txt
207207
- export NUCLEI_SDK_NMSIS=$(readlink -f NMSIS)
208208
- export NMSIS_LOGS=$NUCLEI_SDK_NMSIS/Logs
209209
# change ilm/dlm size from 64K to 1M for ${SOC}
@@ -250,7 +250,7 @@ test_nn_library_terapines:
250250
script:
251251
- git clone -b $SDK_BRANCH $NUCLEI_SDK NMSIS/nuclei_sdk
252252
- export NUCLEI_SDK_ROOT=$(readlink -f NMSIS/nuclei_sdk)
253-
#- pip3 install -r $NUCLEI_SDK_ROOT/tools/scripts/requirements.txt
253+
- pip3 install -r $NUCLEI_SDK_ROOT/tools/scripts/requirements.txt
254254
- export NUCLEI_SDK_NMSIS=$(readlink -f NMSIS)
255255
- export NMSIS_LOGS=$NUCLEI_SDK_NMSIS/Logs
256256
- echo "Setup Zcc toolchain PATH"
@@ -296,7 +296,7 @@ test_dsp_library:
296296
script:
297297
- git clone -b $SDK_BRANCH $NUCLEI_SDK NMSIS/nuclei_sdk
298298
- export NUCLEI_SDK_ROOT=$(readlink -f NMSIS/nuclei_sdk)
299-
#- pip3 install -r $NUCLEI_SDK_ROOT/tools/scripts/requirements.txt
299+
- pip3 install -r $NUCLEI_SDK_ROOT/tools/scripts/requirements.txt
300300
- export NUCLEI_SDK_NMSIS=$(readlink -f NMSIS)
301301
- export NMSIS_LOGS=$NUCLEI_SDK_NMSIS/Logs
302302
# change ilm/dlm size from 64K to 1M for ${SOC}
@@ -340,7 +340,7 @@ test_dsp_library_terapines:
340340
script:
341341
- git clone -b $SDK_BRANCH $NUCLEI_SDK NMSIS/nuclei_sdk
342342
- export NUCLEI_SDK_ROOT=$(readlink -f NMSIS/nuclei_sdk)
343-
#- pip3 install -r $NUCLEI_SDK_ROOT/tools/scripts/requirements.txt
343+
- pip3 install -r $NUCLEI_SDK_ROOT/tools/scripts/requirements.txt
344344
- export NUCLEI_SDK_NMSIS=$(readlink -f NMSIS)
345345
- export NMSIS_LOGS=$NUCLEI_SDK_NMSIS/Logs
346346
- echo "Setup Zcc toolchain PATH"

0 commit comments

Comments
 (0)