diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 186ab9650..92ec9d844 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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 diff --git a/deps-packaging/lcov/README b/deps-packaging/lcov/README new file mode 100644 index 000000000..9a502a5b7 --- /dev/null +++ b/deps-packaging/lcov/README @@ -0,0 +1,5 @@ +lcov is a continuous integration test dependency. + +it is not packaged in any way with the resulting CFEngine agent or hub packages. + +we are not using the perl module so that is skipped during packaging. diff --git a/deps-packaging/lcov/cfbuild-lcov.spec b/deps-packaging/lcov/cfbuild-lcov.spec index 8abb3f504..98b5b10d1 100644 --- a/deps-packaging/lcov/cfbuild-lcov.spec +++ b/deps-packaging/lcov/cfbuild-lcov.spec @@ -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 @@ -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