Skip to content

Commit c43fdbc

Browse files
vaughnbetzvaughnbetz
authored
Merge pull request #1804 from umarcor/ci-scripts
 ci: move scripts from '.github/gha' and '.github/travis' into '.github/scripts'
2 parents b05b77c + 54402b0 commit c43fdbc

File tree

9 files changed

+42
-61
lines changed

9 files changed

+42
-61
lines changed

‎.github/labeler.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ docs:
5454
- tutorial
5555
- "*.rst"
5656
infra:
57-
- "*travis*"
5857
- .github/*
5958
- .github/**/*
6059
- Dockerfile

‎.github/travis/build.sh renamed to ‎.github/scripts/build.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
#!/bin/bash
22

3-
source .github/travis/common.sh
43
set -e
54

5+
source $(dirname "$0")/common.sh
6+
67
$SPACER
78

89
start_section "vtr.build" "${GREEN}Building..${NC}"

‎.github/travis/common.sh renamed to ‎.github/scripts/common.sh

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,6 @@ NC='\033[0m' # No Color
1313

1414
SPACER="echo -e ${GRAY} - ${NC}"
1515

16-
travis_nanoseconds() { true; }
17-
travis_fold() { true; }
18-
travis_time_start() { true; }
19-
travis_time_finish() { true; }
20-
2116
function start_section() {
2217
echo -e "${PURPLE}Verilog To Routing${NC}: - $2${NC}"
2318
echo -e "${GRAY}-------------------------------------------------------------------${NC}"

‎.github/travis/cron_build.sh renamed to ‎.github/scripts/cron_build.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
#!/bin/bash
22

3-
source .github/travis/common.sh
43
set -e
54

5+
source $(dirname "$0")/common.sh
6+
67
$SPACER
78

89
if [ "_${_COVERITY_EMAIL}" == "_" ] ||

‎.github/gha/install_dependencies.sh renamed to ‎.github/scripts/install_dependencies.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,3 +49,5 @@ sudo apt install -y \
4949
clang-7 \
5050
clang-10
5151
# libtbb-dev
52+
53+
pip install -r requirements.txt

‎.github/travis/unittest.sh renamed to ‎.github/scripts/unittest.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
#!/bin/bash
22

3-
source .github/travis/common.sh
43
set -e
54

5+
source $(dirname "$0")/common.sh
6+
7+
$(dirname "$0")/build.sh
8+
69
$SPACER
710

811
start_section "vtr.test.0" "${GREEN}Testing..${NC} ${CYAN}C++ unit tests${NC}"

‎.github/workflows/test.yml

Lines changed: 28 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,16 @@ jobs:
1919
runs-on: ubuntu-18.04
2020
steps:
2121

22-
- uses: actions/checkout@v2
23-
- run: ./.github/gha/install_dependencies.sh
2422
- uses: actions/setup-python@v2
2523
with:
2624
python-version: 3.6
27-
- run: pip install -r requirements.txt
25+
- uses: actions/checkout@v2
26+
- run: ./.github/scripts/install_dependencies.sh
2827

2928
- name: Test
3029
env:
3130
BUILD_TYPE: release
32-
run: |
33-
source .github/travis/common.sh
34-
./.github/travis/build.sh
31+
run: ./.github/scripts/build.sh
3532

3633

3734
Format:
@@ -46,60 +43,50 @@ jobs:
4643
name: 'F: ${{ matrix.name }}'
4744
steps:
4845

49-
- uses: actions/checkout@v2
50-
- run: ./.github/gha/install_dependencies.sh
5146
- uses: actions/setup-python@v2
5247
with:
5348
python-version: 3.6
54-
- run: pip install -r requirements.txt
49+
- uses: actions/checkout@v2
50+
- run: ./.github/scripts/install_dependencies.sh
5551

5652
- name: Test
57-
run: |
58-
source .github/travis/common.sh
59-
./dev/${{ matrix.script }}
53+
run: ./dev/${{ matrix.script }}
6054

6155

6256
UniTests:
6357
name: 'U: C++ Unit Tests'
6458
runs-on: ubuntu-18.04
6559
steps:
6660

67-
- uses: actions/checkout@v2
68-
- run: ./.github/gha/install_dependencies.sh
6961
- uses: actions/setup-python@v2
7062
with:
7163
python-version: 3.6
72-
- run: pip install -r requirements.txt
64+
- uses: actions/checkout@v2
65+
- run: ./.github/scripts/install_dependencies.sh
7366

7467
- name: Test
7568
env:
7669
CMAKE_PARAMS: "-DVTR_ASSERT_LEVEL=3 -DWITH_BLIFEXPLORER=on"
77-
run: |
78-
source .github/travis/common.sh
79-
./.github/travis/build.sh
80-
./.github/travis/unittest.sh
70+
run: ./.github/scripts/unittest.sh
8171

8272

8373
Warnings:
8474
name: 'W: Check Compilation Warnings'
8575
runs-on: ubuntu-18.04
8676
steps:
8777

88-
- uses: actions/checkout@v2
89-
- run: ./.github/gha/install_dependencies.sh
9078
- uses: actions/setup-python@v2
9179
with:
9280
python-version: 3.6
93-
- run: pip install -r requirements.txt
81+
- uses: actions/checkout@v2
82+
- run: ./.github/scripts/install_dependencies.sh
9483

9584
- name: Test
9685
env:
9786
#In order to get compilation warnings produced per source file, we must do a non-IPO build
9887
#We also turn warnings into errors for this target by doing a strict compile
9988
CMAKE_PARAMS: "-DVTR_ASSERT_LEVEL=3 -DWITH_BLIFEXPLORER=on -DVTR_ENABLE_STRICT_COMPILE=on -DVTR_IPO_BUILD=off"
100-
run: |
101-
source .github/travis/common.sh
102-
./.github/travis/build.sh
89+
run: ./.github/scripts/build.sh
10390

10491

10592
Regression:
@@ -137,19 +124,17 @@ jobs:
137124
name: 'R: ${{ matrix.name }}'
138125
steps:
139126

140-
- uses: actions/checkout@v2
141-
- run: ./.github/gha/install_dependencies.sh
142127
- uses: actions/setup-python@v2
143128
with:
144129
python-version: 3.6
145-
- run: pip install -r requirements.txt
130+
- uses: actions/checkout@v2
131+
- run: ./.github/scripts/install_dependencies.sh
146132

147133
- name: Test
148134
env:
149135
CMAKE_PARAMS: ${{ matrix.params }}
150136
run: |
151-
source .github/travis/common.sh
152-
./.github/travis/build.sh
137+
./.github/scripts/build.sh
153138
./run_reg_test.py ${{ matrix.suite }} -show_failures -j2
154139
155140
@@ -164,43 +149,40 @@ jobs:
164149
name: 'S: ${{ matrix.name }}'
165150
steps:
166151

167-
- uses: actions/checkout@v2
168-
- run: ./.github/gha/install_dependencies.sh
169152
- uses: actions/setup-python@v2
170153
with:
171154
python-version: 3.6
172-
- run: pip install -r requirements.txt
155+
- uses: actions/checkout@v2
156+
- run: ./.github/scripts/install_dependencies.sh
173157

174158
- name: Test
175159
env:
176160
CMAKE_PARAMS: '-DVTR_ASSERT_LEVEL=3 -DVTR_ENABLE_SANITIZE=on -DVTR_IPO_BUILD=off -DWITH_BLIFEXPLORER=on'
177161
BUILD_TYPE: debug
178162
LSAN_OPTIONS: 'exitcode=42' #Use a non-standard exit code to ensure LSAN errors are detected
179163
run: |
180-
source .github/travis/common.sh
181-
./.github/travis/build.sh
164+
./.github/scripts/build.sh
182165
# We skip QoR since we are only checking for errors in sanitizer runs
183166
./run_reg_test.py ${{ matrix.suite }} -show_failures -j2 -skip_qor
184167
168+
185169
ODINII:
186170
name: 'ODIN-II Basic Tests'
187171
runs-on: ubuntu-18.04
188172
steps:
189173

190-
- uses: actions/checkout@v2
191-
- run: ./.github/gha/install_dependencies.sh
192174
- uses: actions/setup-python@v2
193175
with:
194176
python-version: 3.6
195-
- run: pip install -r requirements.txt
177+
- uses: actions/checkout@v2
178+
- run: ./.github/scripts/install_dependencies.sh
196179

197180
- name: Test
198181
env:
199182
CMAKE_PARAMS: '-DVTR_ASSERT_LEVEL=3 -DVTR_ENABLE_SANITIZE=on -DVTR_IPO_BUILD=off -DWITH_BLIFEXPLORER=on'
200183
BUILD_TYPE: debug
201184
run: |
202-
source .github/travis/common.sh
203-
./.github/travis/build.sh
185+
./.github/scripts/build.sh
204186
./run_reg_test.py odin_reg_basic -show_failures -j2
205187
206188
@@ -221,21 +203,18 @@ jobs:
221203
name: 'B: ${{ matrix.name }}'
222204
steps:
223205

224-
- uses: actions/checkout@v2
225-
- run: ./.github/gha/install_dependencies.sh
226206
- uses: actions/setup-python@v2
227207
with:
228208
python-version: 3.6
229-
- run: pip install -r requirements.txt
209+
- uses: actions/checkout@v2
210+
- run: ./.github/scripts/install_dependencies.sh
230211

231212
- name: Test
232213
env:
233214
CMAKE_PARAMS: "-DVTR_ASSERT_LEVEL=3 -DWITH_BLIFEXPLORER=on"
234215
MATRIX_EVAL: ${{ matrix.eval }}
235216
BUILD_TYPE: ${{ matrix.build }}
236-
run: |
237-
source .github/travis/common.sh
238-
./.github/travis/build.sh
217+
run: ./.github/scripts/build.sh
239218

240219

241220
Coverity:
@@ -252,18 +231,15 @@ jobs:
252231
runs-on: ubuntu-18.04
253232
steps:
254233

255-
- uses: actions/checkout@v2
256-
- run: ./.github/gha/install_dependencies.sh
257234
- uses: actions/setup-python@v2
258235
with:
259236
python-version: 3.6
260-
- run: pip install -r requirements.txt
237+
- uses: actions/checkout@v2
238+
- run: ./.github/scripts/install_dependencies.sh
261239

262240
- name: Test
263241
env:
264242
CMAKE_PARAMS: '-DVTR_ASSERT_LEVEL=3 -DWITH_BLIFEXPLORER=on'
265243
_COVERITY_URL: 'https://scan.coverity.com/download/linux64'
266244
_COVERITY_MD5: 'd0d7d7df9d6609e578f85096a755fb8f'
267-
run: |
268-
source .github/travis/common.sh
269-
./.github/travis/build.sh
245+
run: ./.github/scripts/build.sh

‎dev/check-format-py.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
#!/usr/bin/env bash
22

3+
source $(dirname "$0")/../.github/scripts/common.sh
4+
35
clean=$(git status -s -uno | wc -l) #Short ignore untracked
46

57
if [ $clean -ne 0 ]; then

‎dev/check-format.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
#!/usr/bin/env bash
22

3+
source $(dirname "$0")/../.github/scripts/common.sh
4+
35
clean=$(git status -s -uno | wc -l) #Short ignore untracked
46

57
if [ $clean -ne 0 ]; then

0 commit comments

Comments
 (0)