]> granicus.if.org Git - graphviz/commitdiff
Use ${HOME} to access rpm build directory
authorMagnus Jacobsson <Magnus.Jacobsson@berotec.se>
Thu, 2 Apr 2020 06:10:16 +0000 (08:10 +0200)
committerMagnus Jacobsson <Magnus.Jacobsson@berotec.se>
Thu, 2 Apr 2020 08:38:04 +0000 (10:38 +0200)
The absolute path on GitLab runners is different from our private
runners.

rpmbuild produces the build in the home directory, not in the current
directory. At least in Docker containers on GitLab runners these are
not the same.

.gitlab-ci.yml

index b59ebc5169073934a428f37a964b38ff2ca65f8f..687a70752306edce238ced96c21234b68f010924 100644 (file)
@@ -22,7 +22,7 @@ portable-source:
 .build_template: &rpm_build_definition
     stage: build
     script:
-        - rm -rf /home/gitlab-runner/rpmbuild
+        - rm -rf ${HOME}/rpmbuild
         - GV_VERSION=$( cat VERSION )
         - COLLECTION=$( cat COLLECTION )
         - rpmbuild -ta graphviz-${GV_VERSION}.tar.gz
@@ -34,9 +34,9 @@ portable-source:
         - mkdir -p ${DIR}/os/${ARCH}
         - mkdir -p ${DIR}/debug/${ARCH}
         - mkdir -p ${DIR}/source
-        - mv /home/gitlab-runner/rpmbuild/SRPMS/*.src.rpm ${DIR}/source/
-        - mv /home/gitlab-runner/rpmbuild/RPMS/*/*debuginfo*rpm ${DIR}/debug/${ARCH}/
-        - mv /home/gitlab-runner/rpmbuild/RPMS/*/*.rpm ${DIR}/os/${ARCH}/
+        - mv ${HOME}/rpmbuild/SRPMS/*.src.rpm ${DIR}/source/
+        - mv ${HOME}/rpmbuild/RPMS/*/*debuginfo*rpm ${DIR}/debug/${ARCH}/
+        - mv ${HOME}/rpmbuild/RPMS/*/*.rpm ${DIR}/os/${ARCH}/
     artifacts:
         when: on_success
         expire_in: 1 week