Skip to content

Commit

Permalink
Adjusted lcov build to skip python bytecompiling test component
Browse files Browse the repository at this point in the history
Ticket: ENT-12140
Changelog: squashme
  • Loading branch information
craigcomstock committed Aug 23, 2024
1 parent 2e8a4a5 commit 773bb4d
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 16 deletions.
32 changes: 16 additions & 16 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
name: Continuous Integration

on:
# run this workflow on pull_request activity
# this includes opening and pushing more commits
pull_request:
branches: [ master, 3.21.x, 3.18.x ]

jobs:
build_cfengine_hub_package:
uses: ./.github/workflows/build-using-buildscripts.yml
secrets: inherit

deployment_tests:
needs: build_cfengine_hub_package
uses: ./.github/workflows/deployment-tests.yml
secrets: inherit
#
#on:
# # run this workflow on pull_request activity
# # this includes opening and pushing more commits
# pull_request:
# branches: [ master, 3.21.x, 3.18.x ]
#
#jobs:
# build_cfengine_hub_package:
# uses: ./.github/workflows/build-using-buildscripts.yml
# secrets: inherit
#
# deployment_tests:
# needs: build_cfengine_hub_package
# uses: ./.github/workflows/deployment-tests.yml
# secrets: inherit
11 changes: 11 additions & 0 deletions deps-packaging/lcov/cfbuild-lcov.spec
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,20 @@ for easy navigation within the file structure.
%build
exit 0

# spreadsheet.py is part of tests and requires python3, python2.75 is current default in centos-7 build host
%define __python %{python3}
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT PREFIX=/usr CFG_DIR=/etc
# cleanup bits we don't need to package
rm -rf ${RPM_BUILD_ROOT}%{buildprefix}/usr/bin/perl2lcov
rm -rf ${RPM_BUILD_ROOT}%{buildprefix}/usr/bin/py2lcov
rm -rf ${RPM_BUILD_ROOT}%{buildprefix}/usr/bin/xml2lcov
rm -rf ${RPM_BUILD_ROOT}%{buildprefix}/usr/bin/xml2lcovutil.py
rm -rf ${RPM_BUILD_ROOT}%{buildprefix}/usr/lib/lcov/lcovutil.pm
rm -rf ${RPM_BUILD_ROOT}%{buildprefix}/usr/share/lcov/example/Makefile
rm -rf ${RPM_BUILD_ROOT}%{buildprefix}/support-scripts
rm -rf ${RPM_BUILD_ROOT}%{buildprefix}/tests

%clean
rm -rf $RPM_BUILD_ROOT
Expand Down

0 comments on commit 773bb4d

Please sign in to comment.