Skip to content

Commit c88e6ad

Browse files
committed
Inject full product version in package description
1 parent d200bac commit c88e6ad

File tree

3 files changed

+10
-3
lines changed

3 files changed

+10
-3
lines changed

build/rpm/helix-auth-svc.spec

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
%define p4release %(echo -n $ID_REL_BASE)
22
%define p4change %(echo -n $ID_PATCH)
3+
%define hasversion %(echo -n "HAS/noarch/${ID_REL_BASE}/${ID_PATCH}")
34
%define installprefix /opt/perforce/helix-auth-svc
45

56
Name: helix-auth-svc
@@ -49,7 +50,9 @@ cp -pr views/* %{buildroot}%{installprefix}/views
4950
cp ecosystem.config.js %{buildroot}%{installprefix}/ecosystem.config.js
5051
cp logging.config.js %{buildroot}%{installprefix}/logging.config.js
5152
cp package-lock.json %{buildroot}%{installprefix}/package-lock.json
52-
sed -e "s/\"2020.1.9999999\"/\"${ID_REL_BASE}\"/" package.json > %{buildroot}%{installprefix}/package.json
53+
sed -e "s/\"2019.1.1-000001\"/\"${ID_REL_BASE}.${ID_PATCH}\"/" \
54+
-e "s|+MAIN+|%{hasversion}|" \
55+
package.json > %{buildroot}%{installprefix}/package.json
5356
cp README.md %{buildroot}%{installprefix}/README.md
5457

5558
%files

build/ubuntu16/Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ FROM ubuntu:16.04
88

99
ARG ID_REL_BASE=2020.1
1010
ARG ID_PATCH=9999999
11+
ENV HAS_VERSION "HAS/noarch/${ID_REL_BASE}/${ID_PATCH}"
1112
ENV DIRNAME helix-auth-svc-${ID_REL_BASE}
1213
ENV PKGNAME helix-auth-svc_${ID_REL_BASE}
1314
ENV PACKAGE_FILENAME ${PKGNAME}-${ID_PATCH}~xenial_amd64.deb
@@ -42,7 +43,8 @@ COPY ecosystem.config.js ecosystem.config.js
4243
COPY logging.config.js logging.config.js
4344
COPY package-lock.json package-lock.json
4445
COPY package.json package.json.in
45-
RUN sed -e "s/\"2020.1.9999999\"/\"${ID_REL_BASE}.${ID_PATCH}\"/" package.json.in > package.json && \
46+
RUN sed -e "s/\"2019.1.1-000001\"/\"${ID_REL_BASE}.${ID_PATCH}\"/" \
47+
-e "s|+MAIN+|${HAS_VERSION}|" package.json.in > package.json && \
4648
rm -f package.json.in
4749
COPY README.md README.md
4850

build/ubuntu18/Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ FROM ubuntu:18.04
88

99
ARG ID_REL_BASE=2020.1
1010
ARG ID_PATCH=9999999
11+
ENV HAS_VERSION "HAS/noarch/${ID_REL_BASE}/${ID_PATCH}"
1112
ENV DIRNAME helix-auth-svc-${ID_REL_BASE}
1213
ENV PKGNAME helix-auth-svc_${ID_REL_BASE}
1314
ENV PACKAGE_FILENAME ${PKGNAME}-${ID_PATCH}~bionic_amd64.deb
@@ -42,7 +43,8 @@ COPY ecosystem.config.js ecosystem.config.js
4243
COPY logging.config.js logging.config.js
4344
COPY package-lock.json package-lock.json
4445
COPY package.json package.json.in
45-
RUN sed -e "s/\"2020.1.9999999\"/\"${ID_REL_BASE}.${ID_PATCH}\"/" package.json.in > package.json && \
46+
RUN sed -e "s/\"2019.1.1-000001\"/\"${ID_REL_BASE}.${ID_PATCH}\"/" \
47+
-e "s|+MAIN+|${HAS_VERSION}|" package.json.in > package.json && \
4648
rm -f package.json.in
4749
COPY README.md README.md
4850

0 commit comments

Comments
 (0)