Fix broken Fedora 30/31 RPM builds (#8572)

This commit is contained in:
James Mills 2020-04-02 21:29:32 +10:00 committed by GitHub
parent 6ab584a3b6
commit 71290d9cb9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions

View File

@ -329,6 +329,7 @@ jobs:
<<: *RPM_TEMPLATE
if: commit_message =~ /\[Package (amd64|arm64) RPM( Fedora)?\]/
env:
- CFLAGS="-fPIC"
- BUILDER_NAME="builder" BUILD_DISTRO="fedora" BUILD_RELEASE="31" BUILD_STRING="fedora/31"
- PACKAGE_TYPE="rpm" REPO_TOOL="dnf"
- ALLOW_SOFT_FAILURE_HERE=true
@ -337,6 +338,7 @@ jobs:
<<: *RPM_TEMPLATE
if: commit_message =~ /\[Package (amd64|arm64) RPM( Fedora)?\]/
env:
- CFLAGS="-fPIC"
- BUILDER_NAME="builder" BUILD_DISTRO="fedora" BUILD_RELEASE="30" BUILD_STRING="fedora/30"
- PACKAGE_TYPE="rpm" REPO_TOOL="dnf"
- ALLOW_SOFT_FAILURE_HERE=true

View File

@ -50,6 +50,6 @@ common.run_command(container, [os.environ["REPO_TOOL"], "install", "-y", "rpmdev
# Run the build process on the container
print("Starting RPM build process")
common.run_command(container, ["sudo", "-u", os.environ['BUILDER_NAME'], "rpmbuild", "-ba", "--rebuild", "/home/%s/rpmbuild/SPECS/netdata.spec" % os.environ['BUILDER_NAME']])
common.run_command(container, ["sudo", "-E", "-u", os.environ['BUILDER_NAME'], "rpmbuild", "-ba", "--rebuild", "/home/%s/rpmbuild/SPECS/netdata.spec" % os.environ['BUILDER_NAME']])
print('Done!')