Skip to content

Commit ec4b019

Browse files
committed
circleci: unify ubi8 related jobs into one
Signed-off-by: Masatake YAMATO <[email protected]>
1 parent 97ec489 commit ec4b019

File tree

1 file changed

+3
-28
lines changed

1 file changed

+3
-28
lines changed

circle.yml

Lines changed: 3 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ jobs:
198198
command: |
199199
make check roundtrip
200200
201-
ubi8_make:
201+
ubi8:
202202
working_directory: ~/universal-ctags
203203
docker:
204204
- image: registry.access.redhat.com/ubi8:latest
@@ -221,32 +221,8 @@ jobs:
221221
- run:
222222
name: Test
223223
command: |
224-
make check
224+
make check roundtrip
225225
226-
ubi8_make_roundtrip:
227-
working_directory: ~/universal-ctags
228-
docker:
229-
- image: registry.access.redhat.com/ubi8:latest
230-
steps:
231-
- run:
232-
name: Install Git
233-
command: |
234-
yum -y install git
235-
- checkout
236-
- run:
237-
name: Install build tools
238-
command: |
239-
yum -y --enablerepo=ubi-8-appstream-rpms --enablerepo=ubi-8-baseos-rpms --enablerepo=ubi-8-codeready-builder-rpms install python3 gcc automake autoconf pkgconfig make libxml2-devel libyaml-devel pcre2-devel findutils diffutils sudo
240-
- run:
241-
name: Build
242-
command: |
243-
bash ./autogen.sh
244-
./configure --enable-debugging
245-
make -j 2
246-
- run:
247-
name: Test
248-
command: |
249-
make roundtrip
250226
centos7_make:
251227
working_directory: ~/universal-ctags
252228
docker:
@@ -408,12 +384,11 @@ workflows:
408384
- fedora30_bmake
409385
- fedora38_distcheck
410386
- stream9
411-
- ubi8_make
387+
- ubi8
412388
- fedora38_gmake
413389
- fedora33_cross_aarch64
414390
- centos7_make
415391
- ubuntu20_mingw
416-
- ubi8_make_roundtrip
417392
- fedora30_bmake_roundtrip
418393
- fedora38_gmake_roundtrip
419394
- centos7_make_roundtrip

0 commit comments

Comments
 (0)