Skip to content

Commit ed49a35

Browse files
[CI] Fixed Bugs in New Flow
1 parent 420e318 commit ed49a35

File tree

2 files changed

+15
-48
lines changed

2 files changed

+15
-48
lines changed

.github/workflows/test.yml

Lines changed: 13 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -34,42 +34,6 @@ env:
3434
MATRIX_EVAL: "CC=gcc-13 && CXX=g++-13"
3535

3636
jobs:
37-
Build:
38-
name: 'B: Building VtR'
39-
runs-on: ubuntu-24.04
40-
strategy:
41-
fail-fast: false
42-
matrix:
43-
include:
44-
- { build_type: 'debug', verbose: '0' }
45-
- { build_type: 'debug', verbose: '1' }
46-
steps:
47-
48-
- uses: actions/setup-python@v5
49-
with:
50-
python-version: 3.12.3
51-
- uses: actions/checkout@v4
52-
with:
53-
submodules: 'true'
54-
55-
- name: Get number of CPU cores
56-
uses: SimenB/github-actions-cpu-cores@v2
57-
id: cpu-cores
58-
59-
- name: Install dependencies
60-
run: ./.github/scripts/install_dependencies.sh
61-
62-
- uses: hendrikmuhs/[email protected]
63-
64-
- name: Test
65-
env:
66-
BUILD_TYPE: ${{ matrix.build_type }}
67-
NUM_PROC: ${{ steps.cpu-cores.outputs.count }}
68-
run: |
69-
export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
70-
./.github/scripts/build.sh VERBOSE=${{ matrix.verbose }}
71-
72-
7337
BuildVTR:
7438
name: 'B: Building VTR Release'
7539
runs-on: ubuntu-24.04
@@ -108,6 +72,7 @@ jobs:
10872
path: build.tar.gz
10973
retention-days: 1
11074

75+
# FIXME: This is not needed. Remove.
11176
- name: Print CCache Statistics
11277
run: |
11378
ccache -s
@@ -136,6 +101,7 @@ jobs:
136101
BUILD_TYPE: release
137102
NUM_PROC: ${{ steps.cpu-cores.outputs.count }}
138103
run: |
104+
sudo sysctl -w vm.mmap_rnd_bits=28
139105
export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
140106
make -j${{ steps.cpu-cores.outputs.count}}
141107
@@ -220,18 +186,15 @@ jobs:
220186
- name: Install dependencies
221187
run: ./.github/scripts/install_dependencies.sh
222188

223-
- name: Download Build Artifact
224-
uses: actions/download-artifact@v4
225-
with:
226-
name: build-release.tar.gz
227-
228-
- name: Unpack Build
229-
shell: bash
230-
run: |
231-
tar -xvzf build.tar.gz
189+
- name: 'ccache'
190+
uses: hendrikmuhs/[email protected]
232191

233192
- name: Test
193+
env:
194+
CMAKE_PARAMS: "-DVTR_ASSERT_LEVEL=3"
195+
NUM_PROC: ${{ steps.cpu-cores.outputs.count }}
234196
run: |
197+
export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
235198
make test -j${{ steps.cpu-cores.outputs.count }}
236199
237200
@@ -240,6 +203,7 @@ jobs:
240203
# that these build variations are warning clean.
241204
BuildVariations:
242205
runs-on: ubuntu-24.04
206+
needs: [BuildVTR]
243207
name: 'B: Build Variations'
244208
env:
245209
# For the CI, we want all build variations to be warning clean.
@@ -349,7 +313,7 @@ jobs:
349313
name: 'Strong',
350314
params: '-DCMAKE_COMPILE_WARNING_AS_ERROR=on -DVTR_IPO_BUILD=off -DVTR_ASSERT_LEVEL=3 -DWITH_BLIFEXPLORER=on',
351315
suite: 'vtr_reg_strong',
352-
extra_pkgs: "libeigen3-dev"
316+
extra_pkgs: ""
353317
}
354318
]
355319
name: 'R: ${{ matrix.name }}'
@@ -496,6 +460,7 @@ jobs:
496460
497461
Sanitized:
498462
runs-on: ubuntu-24.04
463+
needs: [BuildVTRWithOdin]
499464
strategy:
500465
fail-fast: false
501466
matrix:
@@ -654,6 +619,7 @@ jobs:
654619
655620
Compatibility:
656621
runs-on: ubuntu-24.04
622+
needs: [BuildVTR]
657623
strategy:
658624
fail-fast: false
659625
matrix:
@@ -697,6 +663,7 @@ jobs:
697663
JammyCompatibility:
698664
name: 'Ubuntu Jammy - 22.04 Compatibility Test'
699665
runs-on: ubuntu-22.04
666+
needs: [BuildVTR]
700667
steps:
701668
- uses: actions/setup-python@v5
702669
with:
@@ -728,7 +695,6 @@ jobs:
728695
Coverity:
729696
name: 'Coverity Scan'
730697
needs:
731-
- Build
732698
- Format
733699
- VerifyTestSuites
734700
- UnitTests

install_apt_packages.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ sudo apt-get install -y \
1313

1414
# Packages for more complex features of VTR that most people will use.
1515
sudo apt-get install -y \
16-
libtbb-dev
16+
libtbb-dev \
17+
libeigen3-dev
1718

1819
# Required for graphics
1920
sudo apt-get install -y \

0 commit comments

Comments
 (0)