[pkg] add git_commit macro on the fly

tar archive created by ci doesn't contain untracked files
inverse-inc · Nov 26, 2019 · d97d154 · d97d154
1 parent 6bd5848
commit d97d154
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -193,9 +193,9 @@ variables:
 
 .rpm_script:
   script:
-    - cp ${RPM_DIR}/.rpmmacros ${HOME}
     # temp
-    - make conf/git_commit_id
+    - echo "%git_commit $CI_COMMIT_SHA" >> ${RPM_DIR}/.rpmmacros
+    - cp ${RPM_DIR}/.rpmmacros ${HOME}
     - ci-build-pkg ${RPM_DIR}
 
 .deb_script:

diff --git a/rpm/packetfence.spec b/rpm/packetfence.spec
@@ -352,6 +352,8 @@ done
 %{__make} bin/pfcmd
 # build ntlm_auth_wrapper
 %{__make} bin/ntlm_auth_wrapper
+# Define git_commit_id
+echo %{git_commit} > conf/git_commit_id
 
 # build golang binaries
 %{__make} -C go all