Skip to content

Commit

Permalink
Adjusted lcov build to include/exclude different items from the new v…
Browse files Browse the repository at this point in the history
…ersion 2.1

Ticket: ENT-12140
Changelog: none
  • Loading branch information
craigcomstock committed Aug 26, 2024
1 parent 2e8a4a5 commit ab298cf
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 18 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
13 changes: 11 additions & 2 deletions deps-packaging/lcov/cfbuild-lcov.spec
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,14 @@ 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 /usr/lib/lcov/lcovutil.pm

%clean
rm -rf $RPM_BUILD_ROOT
Expand All @@ -37,13 +42,17 @@ rm -rf $RPM_BUILD_ROOT
/usr/bin/geninfo
/usr/bin/genpng
/usr/bin/lcov
/usr/share/man/man1
/usr/bin/perl2lcov
/usr/bin/py2lcov
/usr/bin/xml2lcov
/usr/bin/xml2lcovutil.py
/usr/lib/lcov/lcovutil.pm
/usr/share/lcov
/usr/share/man/man1/gendesc.1.gz
/usr/share/man/man1/genhtml.1.gz
/usr/share/man/man1/geninfo.1.gz
/usr/share/man/man1/genpng.1.gz
/usr/share/man/man1/lcov.1.gz
/usr/share/man/man5
/usr/share/man/man5/lcovrc.5.gz

%changelog
Expand Down

0 comments on commit ab298cf

Please sign in to comment.