Merge pull request #13181 from rgacogne/fix-provenance

Fix provenance generation for our packages
PowerDNS · Aug 29, 2023 · 5f3989f · 5f3989f
2 parents 6e251be + 212f3bb
commit 5f3989f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/build-packages.yml b/.github/workflows/build-packages.yml
@@ -14,7 +14,7 @@ on:
         type: string
         # please remember to update the pkghashes below when you
         # update this list, as well as the one in builder-dispatch.yml
-        default: >
+        default: >-
           el-7
           el-8
           el-9

diff --git a/.github/workflows/builder-dispatch.yml b/.github/workflows/builder-dispatch.yml
@@ -15,7 +15,7 @@ on:
         description: OSes to build for, space separated
         type: string
         # please remember to update build-packages.yml as well
-        default: >
+        default: >-
           el-7
           el-8
           el-9

diff --git a/builder-support/dockerfiles/Dockerfile.rpmbuild b/builder-support/dockerfiles/Dockerfile.rpmbuild
@@ -59,10 +59,10 @@ RUN touch /var/lib/rpm/* && if $(grep -q 'release 7' /etc/redhat-release); then
 @ENDIF
 
 # Generate provenance
-@IF [ ${BUILDER_TARGET} = el-7 || ${BUILDER_TARGET} = centos-7 ]
+@IF [ "${BUILDER_TARGET}" = "el-7" -o "${BUILDER_TARGET}" = "centos-7" ]
 @EVAL RUN python builder/helpers/generate-yum-provenance.py /dist/packages-${BUILDER_TARGET}.json || python3 builder/helpers/generate-yum-provenance.py /dist/packages-${BUILDER_TARGET}.json
 @ENDIF
-@IF [ ${BUILDER_TARGET} != el-7 && ${BUILDET_TARGET} != centos-7 ]
+@IF [ "${BUILDER_TARGET}" != "el-7" -a "${BUILDER_TARGET}" != "centos-7" ]
 @EVAL RUN python builder/helpers/generate-dnf-provenance.py /dist/packages-${BUILDER_TARGET}.json || python3 builder/helpers/generate-dnf-provenance.py /dist/packages-${BUILDER_TARGET}.json
 @ENDIF