Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 0 additions & 60 deletions .github/scripts/install_dependencies.sh

This file was deleted.

56 changes: 0 additions & 56 deletions .github/scripts/install_jammy_dependencies.sh

This file was deleted.

3 changes: 2 additions & 1 deletion .github/workflows/nightly_test_manual.yml
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,7 @@ jobs:
- uses: actions/setup-python@v5
with:
python-version: 3.12.3

- uses: actions/checkout@v4
with:
submodules: 'true'
Expand All @@ -153,7 +154,7 @@ jobs:
id: cpu-cores

- name: Install dependencies
run: ./.github/scripts/install_dependencies.sh
run: ./install_apt_packages.sh

- uses: hendrikmuhs/ccache-action@v1.2
with:
Expand Down
87 changes: 68 additions & 19 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
id: cpu-cores

- name: Install dependencies
run: ./.github/scripts/install_dependencies.sh
run: ./install_apt_packages.sh

- uses: hendrikmuhs/ccache-action@v1.2
with:
Expand Down Expand Up @@ -87,8 +87,14 @@ jobs:
uses: SimenB/github-actions-cpu-cores@v2
id: cpu-cores

# NOTE: BlifExplorer requires Qt5 to build. We do not currently actually
# run the executable as part of the CI, but we at least want to test
# that it can be compiled.
- name: Install dependencies
run: ./.github/scripts/install_dependencies.sh
run: |
./install_apt_packages.sh
sudo apt-get update
sudo apt-get install qtbase5-dev

- uses: hendrikmuhs/ccache-action@v1.2
with:
Expand Down Expand Up @@ -194,7 +200,7 @@ jobs:
id: cpu-cores

- name: Install dependencies
run: ./.github/scripts/install_dependencies.sh
run: ./install_apt_packages.sh

- name: Download Build Artifact
uses: actions/download-artifact@v4
Expand Down Expand Up @@ -237,7 +243,11 @@ jobs:
id: cpu-cores

- name: 'Install dependencies'
run: ./.github/scripts/install_dependencies.sh
run: ./install_apt_packages.sh

- name: 'Install Python Requirements'
run: |
pip install -r requirements.txt

- name: 'ccache'
uses: hendrikmuhs/ccache-action@v1.2
Expand Down Expand Up @@ -320,19 +330,23 @@ jobs:
include: [
{
name: 'Basic',
suite: 'vtr_reg_basic'
suite: 'vtr_reg_basic',
extra_pkgs: ''
},
{
name: 'Strong',
suite: 'vtr_reg_strong'
suite: 'vtr_reg_strong',
extra_pkgs: ''
},
{
name: 'SystemVerilog',
suite: 'vtr_reg_system_verilog'
suite: 'vtr_reg_system_verilog',
extra_pkgs: ''
},
{
name: 'Valgrind Memory',
suite: 'vtr_reg_valgrind_small'
suite: 'vtr_reg_valgrind_small',
extra_pkgs: 'valgrind'
}
]
name: 'R: ${{ matrix.name }}'
Expand All @@ -351,7 +365,17 @@ jobs:
id: cpu-cores

- name: Install dependencies
run: ./.github/scripts/install_dependencies.sh
run: ./install_apt_packages.sh

- name: Install Extra Dependencies
if: ${{ matrix.extra_pkgs != '' }}
run: |
sudo apt update
sudo apt install -y ${{ matrix.extra_pkgs }}

- name: Install Python Requirements
run: |
pip install -r requirements.txt

- name: Download Build Artifact
uses: actions/download-artifact@v4
Expand Down Expand Up @@ -398,15 +422,18 @@ jobs:
include: [
{
name: 'Basic_odin',
suite: 'vtr_reg_basic_odin'
suite: 'vtr_reg_basic_odin',
extra_pkgs: ''
},
{
name: 'Strong_odin',
suite: 'vtr_reg_strong_odin'
suite: 'vtr_reg_strong_odin',
extra_pkgs: ''
},
{
name: 'Valgrind Memory Odin',
suite: 'vtr_reg_valgrind_small_odin'
suite: 'vtr_reg_valgrind_small_odin',
extra_pkgs: 'valgrind'
}
]
name: 'R: ${{ matrix.name }}'
Expand All @@ -425,7 +452,17 @@ jobs:
id: cpu-cores

- name: Install dependencies
run: ./.github/scripts/install_dependencies.sh
run: ./install_apt_packages.sh

- name: Install Extra Dependencies
if: ${{ matrix.extra_pkgs != '' }}
run: |
sudo apt update
sudo apt install -y ${{ matrix.extra_pkgs }}

- name: Install Python Requirements
run: |
pip install -r requirements.txt

- name: Download Build Artifact
uses: actions/download-artifact@v4
Expand Down Expand Up @@ -493,7 +530,11 @@ jobs:
id: cpu-cores

- name: Install dependencies
run: ./.github/scripts/install_dependencies.sh
run: ./install_apt_packages.sh

- name: Install Python Requirements
run: |
pip install -r requirements.txt

- uses: hendrikmuhs/ccache-action@v1.2
with:
Expand Down Expand Up @@ -536,7 +577,11 @@ jobs:
id: cpu-cores

- name: Install dependencies
run: ./.github/scripts/install_dependencies.sh
run: ./install_apt_packages.sh

- name: Install Python Requirements
run: |
pip install -r requirements.txt

- name: Download Build Artifact
uses: actions/download-artifact@v4
Expand Down Expand Up @@ -571,7 +616,11 @@ jobs:
id: cpu-cores

- name: Install dependencies
run: ./.github/scripts/install_dependencies.sh
run: ./install_apt_packages.sh

- name: Install Python Requirements
run: |
pip install -r requirements.txt

- name: Download Build Artifact
uses: actions/download-artifact@v4
Expand Down Expand Up @@ -607,7 +656,7 @@ jobs:
id: cpu-cores

- name: Install dependencies
run: ./.github/scripts/install_dependencies.sh
run: ./install_apt_packages.sh

- name: Download Build Artifact
uses: actions/download-artifact@v4
Expand Down Expand Up @@ -652,7 +701,7 @@ jobs:
id: cpu-cores

- name: Install dependencies
run: ./.github/scripts/install_dependencies.sh
run: ./install_apt_packages.sh

- uses: hendrikmuhs/ccache-action@v1.2
with:
Expand Down Expand Up @@ -683,7 +732,7 @@ jobs:
id: cpu-cores

- name: Install Dependencies
run: ./.github/scripts/install_jammy_dependencies.sh
run: ./install_apt_packages.sh

- uses: hendrikmuhs/ccache-action@v1.2
with:
Expand Down
3 changes: 1 addition & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,13 @@ ENV PIP_BREAK_SYSTEM_PACKAGES=1
# Install and cleanup is done in one command to minimize the build cache size
RUN apt-get update -qq \
# Extract package names from install_apt_packages.sh
&& 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' \
&& 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' \
# Install packages
| xargs apt-get -y install --no-install-recommends \
# Additional packages not listed in install_apt_packages.sh
&& apt-get -y install --no-install-recommends \
wget \
ninja-build \
libeigen3-dev \
python3-pip \
time \
# Install python packages
Expand Down
Loading