Skip to content

Commit 0511c6d

Browse files
AlexandreSingerAlexandreSinger
authored
Merge pull request #3252 from verilog-to-routing/feature-ci-packages
[CI] Moved to Use Standard Package Installer Script
2 parents 2c9efe6 + 4700267 commit 0511c6d

File tree

6 files changed

+113
-170
lines changed

6 files changed

+113
-170
lines changed

‎.github/scripts/install_dependencies.sh‎

Lines changed: 0 additions & 60 deletions
This file was deleted.

‎.github/scripts/install_jammy_dependencies.sh‎

Lines changed: 0 additions & 56 deletions
This file was deleted.

‎.github/workflows/nightly_test_manual.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,7 @@ jobs:
144144
- uses: actions/setup-python@v5
145145
with:
146146
python-version: 3.12.3
147+
147148
- uses: actions/checkout@v4
148149
with:
149150
submodules: 'true'
@@ -153,7 +154,7 @@ jobs:
153154
id: cpu-cores
154155

155156
- name: Install dependencies
156-
run: ./.github/scripts/install_dependencies.sh
157+
run: ./install_apt_packages.sh
157158

158159
- uses: hendrikmuhs/[email protected]
159160
with:

‎.github/workflows/test.yml‎

Lines changed: 68 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
id: cpu-cores
4848

4949
- name: Install dependencies
50-
run: ./.github/scripts/install_dependencies.sh
50+
run: ./install_apt_packages.sh
5151

5252
- uses: hendrikmuhs/[email protected]
5353
with:
@@ -87,8 +87,14 @@ jobs:
8787
uses: SimenB/github-actions-cpu-cores@v2
8888
id: cpu-cores
8989

90+
# NOTE: BlifExplorer requires Qt5 to build. We do not currently actually
91+
# run the executable as part of the CI, but we at least want to test
92+
# that it can be compiled.
9093
- name: Install dependencies
91-
run: ./.github/scripts/install_dependencies.sh
94+
run: |
95+
./install_apt_packages.sh
96+
sudo apt-get update
97+
sudo apt-get install qtbase5-dev
9298
9399
- uses: hendrikmuhs/[email protected]
94100
with:
@@ -194,7 +200,7 @@ jobs:
194200
id: cpu-cores
195201

196202
- name: Install dependencies
197-
run: ./.github/scripts/install_dependencies.sh
203+
run: ./install_apt_packages.sh
198204

199205
- name: Download Build Artifact
200206
uses: actions/download-artifact@v4
@@ -237,7 +243,11 @@ jobs:
237243
id: cpu-cores
238244

239245
- name: 'Install dependencies'
240-
run: ./.github/scripts/install_dependencies.sh
246+
run: ./install_apt_packages.sh
247+
248+
- name: 'Install Python Requirements'
249+
run: |
250+
pip install -r requirements.txt
241251
242252
- name: 'ccache'
243253
uses: hendrikmuhs/[email protected]
@@ -320,19 +330,23 @@ jobs:
320330
include: [
321331
{
322332
name: 'Basic',
323-
suite: 'vtr_reg_basic'
333+
suite: 'vtr_reg_basic',
334+
extra_pkgs: ''
324335
},
325336
{
326337
name: 'Strong',
327-
suite: 'vtr_reg_strong'
338+
suite: 'vtr_reg_strong',
339+
extra_pkgs: ''
328340
},
329341
{
330342
name: 'SystemVerilog',
331-
suite: 'vtr_reg_system_verilog'
343+
suite: 'vtr_reg_system_verilog',
344+
extra_pkgs: ''
332345
},
333346
{
334347
name: 'Valgrind Memory',
335-
suite: 'vtr_reg_valgrind_small'
348+
suite: 'vtr_reg_valgrind_small',
349+
extra_pkgs: 'valgrind'
336350
}
337351
]
338352
name: 'R: ${{ matrix.name }}'
@@ -351,7 +365,17 @@ jobs:
351365
id: cpu-cores
352366

353367
- name: Install dependencies
354-
run: ./.github/scripts/install_dependencies.sh
368+
run: ./install_apt_packages.sh
369+
370+
- name: Install Extra Dependencies
371+
if: ${{ matrix.extra_pkgs != '' }}
372+
run: |
373+
sudo apt update
374+
sudo apt install -y ${{ matrix.extra_pkgs }}
375+
376+
- name: Install Python Requirements
377+
run: |
378+
pip install -r requirements.txt
355379
356380
- name: Download Build Artifact
357381
uses: actions/download-artifact@v4
@@ -398,15 +422,18 @@ jobs:
398422
include: [
399423
{
400424
name: 'Basic_odin',
401-
suite: 'vtr_reg_basic_odin'
425+
suite: 'vtr_reg_basic_odin',
426+
extra_pkgs: ''
402427
},
403428
{
404429
name: 'Strong_odin',
405-
suite: 'vtr_reg_strong_odin'
430+
suite: 'vtr_reg_strong_odin',
431+
extra_pkgs: ''
406432
},
407433
{
408434
name: 'Valgrind Memory Odin',
409-
suite: 'vtr_reg_valgrind_small_odin'
435+
suite: 'vtr_reg_valgrind_small_odin',
436+
extra_pkgs: 'valgrind'
410437
}
411438
]
412439
name: 'R: ${{ matrix.name }}'
@@ -425,7 +452,17 @@ jobs:
425452
id: cpu-cores
426453

427454
- name: Install dependencies
428-
run: ./.github/scripts/install_dependencies.sh
455+
run: ./install_apt_packages.sh
456+
457+
- name: Install Extra Dependencies
458+
if: ${{ matrix.extra_pkgs != '' }}
459+
run: |
460+
sudo apt update
461+
sudo apt install -y ${{ matrix.extra_pkgs }}
462+
463+
- name: Install Python Requirements
464+
run: |
465+
pip install -r requirements.txt
429466
430467
- name: Download Build Artifact
431468
uses: actions/download-artifact@v4
@@ -493,7 +530,11 @@ jobs:
493530
id: cpu-cores
494531

495532
- name: Install dependencies
496-
run: ./.github/scripts/install_dependencies.sh
533+
run: ./install_apt_packages.sh
534+
535+
- name: Install Python Requirements
536+
run: |
537+
pip install -r requirements.txt
497538
498539
- uses: hendrikmuhs/[email protected]
499540
with:
@@ -536,7 +577,11 @@ jobs:
536577
id: cpu-cores
537578

538579
- name: Install dependencies
539-
run: ./.github/scripts/install_dependencies.sh
580+
run: ./install_apt_packages.sh
581+
582+
- name: Install Python Requirements
583+
run: |
584+
pip install -r requirements.txt
540585
541586
- name: Download Build Artifact
542587
uses: actions/download-artifact@v4
@@ -571,7 +616,11 @@ jobs:
571616
id: cpu-cores
572617

573618
- name: Install dependencies
574-
run: ./.github/scripts/install_dependencies.sh
619+
run: ./install_apt_packages.sh
620+
621+
- name: Install Python Requirements
622+
run: |
623+
pip install -r requirements.txt
575624
576625
- name: Download Build Artifact
577626
uses: actions/download-artifact@v4
@@ -607,7 +656,7 @@ jobs:
607656
id: cpu-cores
608657

609658
- name: Install dependencies
610-
run: ./.github/scripts/install_dependencies.sh
659+
run: ./install_apt_packages.sh
611660

612661
- name: Download Build Artifact
613662
uses: actions/download-artifact@v4
@@ -652,7 +701,7 @@ jobs:
652701
id: cpu-cores
653702

654703
- name: Install dependencies
655-
run: ./.github/scripts/install_dependencies.sh
704+
run: ./install_apt_packages.sh
656705

657706
- uses: hendrikmuhs/[email protected]
658707
with:
@@ -683,7 +732,7 @@ jobs:
683732
id: cpu-cores
684733

685734
- name: Install Dependencies
686-
run: ./.github/scripts/install_jammy_dependencies.sh
735+
run: ./install_apt_packages.sh
687736

688737
- uses: hendrikmuhs/[email protected]
689738
with:

‎Dockerfile‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,13 @@ ENV PIP_BREAK_SYSTEM_PACKAGES=1
1111
# Install and cleanup is done in one command to minimize the build cache size
1212
RUN apt-get update -qq \
1313
# Extract package names from install_apt_packages.sh
14-
&& sed '/sudo/d' install_apt_packages.sh | sed '/#/d' | sed '/if\s.*then$/d' | sed '/else$/d' | sed '/fi$/d' | sed '/echo\s/d' | sed 's/ \\//g' | sed '/^$/d' | sed '/^[[:space:]]*$/d' | sed 's/\s//g' \
14+
&& sed '/sudo/d' install_apt_packages.sh | sed '/#/d' | sed '/packages_to_install/d' | sed '/)/d' | sed '/if\s.*then$/d' | sed '/else$/d' | sed '/fi$/d' | sed '/echo\s/d' | sed 's/ \\//g' | sed '/^$/d' | sed '/^[[:space:]]*$/d' | sed 's/\s//g' \
1515
# Install packages
1616
| xargs apt-get -y install --no-install-recommends \
1717
# Additional packages not listed in install_apt_packages.sh
1818
&& apt-get -y install --no-install-recommends \
1919
wget \
2020
ninja-build \
21-
libeigen3-dev \
2221
python3-pip \
2322
time \
2423
# Install python packages

0 commit comments

Comments
 (0)