Skip to content

Commit 9642651

Browse files
donhardmandonhardman
committed
Add github hash commit and hour to final version of rpm and deb packages
1 parent 703985c commit 9642651

File tree

1 file changed

+35
-35
lines changed

1 file changed

+35
-35
lines changed

‎.github/workflows/release.yml‎

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,9 @@ jobs:
3939
uses: actions/checkout@v3
4040
- id: vars
4141
run: |
42-
echo "::set-output name=app_version::${{ github.ref_name }}"
42+
echo "::set-output name=app_version::$(echo ${{ github.ref_name }} | cut -dv -f2)"
43+
echo "::set-output name=rpm_suffix::_$( date +%y%m%d%H ).${GITHUB_SHA:0:7}"
44+
echo "::set-output name=deb_suffix::-$( date +%y%m%d%H )-${GITHUB_SHA:0:7}"
4345
- name: Set up QEMU
4446
if: ${{ matrix.use_buildx == true }}
4547
uses: docker/setup-qemu-action@v2
@@ -80,7 +82,9 @@ jobs:
8082
- uses: actions/checkout@v3
8183
- id: vars
8284
run: |
83-
echo "::set-output name=app_version::${{ github.ref_name }}"
85+
echo "::set-output name=app_version::$(echo ${{ github.ref_name }} | cut -dv -f2)"
86+
echo "::set-output name=rpm_suffix::_$( date +%y%m%d%H ).${GITHUB_SHA:0:7}"
87+
echo "::set-output name=deb_suffix::-$( date +%y%m%d%H )-${GITHUB_SHA:0:7}"
8488
- name: Download artifact
8589
uses: actions/download-artifact@v3
8690
with:
@@ -104,7 +108,7 @@ jobs:
104108
package: ${{ env.APP_NAME }}
105109
package_root: .debpkg
106110
maintainer: ${{ env.MAINTAINER }}
107-
version: ${{ steps.vars.outputs.app_version }}
111+
version: ${{ steps.vars.outputs.app_version }}${{ steps.vars.outputs.deb_suffix }}
108112
arch: 'amd64'
109113
desc: '${{ env.DESC }}'
110114
license: 'PHP-3.01'
@@ -127,7 +131,7 @@ jobs:
127131
128132
# Prepare spec file for RPM
129133
sed -i 's/{{ NAME }}/${{ env.APP_NAME }}/g' $spec_file
130-
sed -i 's/{{ VERSION }}/${{ github.ref_name }}/g' $spec_file
134+
sed -i 's/{{ VERSION }}/${{ steps.vars.outputs.app_version }}${{ steps.vars.outputs.rpm_suffix }}/g' $spec_file
131135
sed -i 's/{{ MAINTAINER }}/${{ env.MAINTAINER }}/g' $spec_file
132136
sed -i 's/{{ DESC }}/${{ env.DESC }}/g' $spec_file
133137
sed -i 's/{{ ARCH }}/x86_64/g' $spec_file
@@ -143,16 +147,13 @@ jobs:
143147
- name: Rename packages to proper name
144148
run: |
145149
ls -lah ./*.rpm
146-
version=$( echo ${{ github.ref_name }} | cut -c2- )
147-
rpm_path="./${{ env.APP_NAME }}-v${version}-1.x86_64.rpm"
148-
rpm_suffix=$( date +%y%m%d ).${GITHUB_SHA:0:7}
149-
cp $rpm_path "./${{ env.APP_NAME }}-${version}_${rpm_suffix}-1.el7.x86_64.rpm"
150-
cp $rpm_path "./${{ env.APP_NAME }}-${version}_${rpm_suffix}-1.el8.x86_64.rpm"
151-
mv $rpm_path "./${{ env.APP_NAME }}-${version}_${rpm_suffix}-1.el9.x86_64.rpm"
150+
version=${{ steps.vars.outputs.app_version }}${{ steps.vars.outputs.rpm_suffix }}
151+
rpm_path="./${{ env.APP_NAME }}-${version}-1.x86_64.rpm"
152+
cp $rpm_path "./${{ env.APP_NAME }}-${version}-1.el7.x86_64.rpm"
153+
cp $rpm_path "./${{ env.APP_NAME }}-${version}-1.el8.x86_64.rpm"
154+
mv $rpm_path "./${{ env.APP_NAME }}-${version}-1.el9.x86_64.rpm"
152155
153156
ls -lah ./*.deb
154-
deb_path="./${{ env.APP_NAME }}_${version}_amd64.deb"
155-
mv "$deb_path" ./${{ env.APP_NAME }}_${version}-$( date +%y%m%d )-${GITHUB_SHA:0:7}_amd64.deb
156157
157158
- uses: actions/upload-artifact@v3
158159
with:
@@ -173,6 +174,11 @@ jobs:
173174
runs-on: ubuntu-22.04
174175
steps:
175176
- uses: actions/checkout@v3
177+
- id: vars
178+
run: |
179+
echo "::set-output name=app_version::$(echo ${{ github.ref_name }} | cut -dv -f2)"
180+
echo "::set-output name=rpm_suffix::_$( date +%y%m%d%H ).${GITHUB_SHA:0:7}"
181+
echo "::set-output name=deb_suffix::-$( date +%y%m%d%H )-${GITHUB_SHA:0:7}"
176182
- name: Download artifact
177183
uses: actions/download-artifact@v3
178184
with:
@@ -194,17 +200,14 @@ jobs:
194200
package: ${{ env.APP_NAME }}
195201
package_root: .debpkg
196202
maintainer: ${{ env.MAINTAINER }}
197-
version: ${{ github.ref }}
203+
version: ${{ steps.vars.outputs.app_version }}${{ steps.vars.outputs.deb_suffix }}
198204
arch: 'arm64'
199205
desc: '${{ env.DESC }}'
200206
license: 'PHP-3.01'
201207

202208
- name: Rename package to proper name
203209
run: |
204210
ls -lah ./*.deb
205-
version=$( echo ${{ github.ref_name }} | cut -c2- )
206-
deb_path="./${{ env.APP_NAME }}_${version}_arm64.deb"
207-
mv "$deb_path" ./${{ env.APP_NAME }}_${version}-$( date +%y%m%d )-${GITHUB_SHA:0:7}_arm64.deb
208211
209212
- uses: actions/upload-artifact@v3
210213
with:
@@ -238,7 +241,7 @@ jobs:
238241
239242
# Prepare spec file for RPM
240243
sed -i 's/{{ NAME }}/${{ env.APP_NAME }}/g' $spec_file
241-
sed -i 's/{{ VERSION }}/${{ github.ref_name }}/g' $spec_file
244+
sed -i 's/{{ VERSION }}/${{ steps.vars.outputs.app_version }}${{ steps.vars.outputs.rpm_suffix }}/g' $spec_file
242245
sed -i 's/{{ MAINTAINER }}/${{ env.MAINTAINER }}/g' $spec_file
243246
sed -i 's/{{ DESC }}/${{ env.DESC }}/g' $spec_file
244247
sed -i 's/{{ ARCH }}/aarch64/g' $spec_file
@@ -254,12 +257,10 @@ jobs:
254257
- name: Rename package to proper name
255258
run: |
256259
ls -lah ./artifacts/*.rpm
257-
version=$( echo ${{ github.ref_name }} | cut -c2- )
258-
rpm_path="./artifacts/${{ env.APP_NAME }}-v${version}-1.el7.aarch64.rpm"
259-
rpm_suffix=$( date +%y%m%d ).${GITHUB_SHA:0:7}
260-
cp $rpm_path "./artifacts/${{ env.APP_NAME }}-${version}_${rpm_suffix}-1.el7.aarch64.rpm"
261-
cp $rpm_path "./artifacts/${{ env.APP_NAME }}-${version}_${rpm_suffix}-1.el8.aarch64.rpm"
262-
mv $rpm_path "./artifacts/${{ env.APP_NAME }}-${version}_${rpm_suffix}-1.el9.aarch64.rpm"
260+
version=${{ steps.vars.outputs.app_version }}${{ steps.vars.outputs.rpm_suffix }}
261+
rpm_path="./artifacts/${{ env.APP_NAME }}-${version}-1.el7.aarch64.rpm"
262+
cp $rpm_path "./artifacts/${{ env.APP_NAME }}-${version}-1.el8.aarch64.rpm"
263+
cp $rpm_path "./artifacts/${{ env.APP_NAME }}-${version}-1.el9.aarch64.rpm"
263264
264265
- uses: actions/upload-artifact@v3
265266
with:
@@ -275,6 +276,8 @@ jobs:
275276
- id: vars
276277
run: |
277278
echo "::set-output name=app_version::$(echo ${{ github.ref_name }} | cut -dv -f2)"
279+
echo "::set-output name=rpm_suffix::_$( date +%y%m%d%H ).${GITHUB_SHA:0:7}"
280+
echo "::set-output name=deb_suffix::-$( date +%y%m%d%H )-${GITHUB_SHA:0:7}"
278281
- name: Prepare packages structure
279282
run: |
280283
mkdir -p .debpkg/usr/bin
@@ -287,7 +290,7 @@ jobs:
287290
package: ${{ env.EXTRA_NAME }}
288291
package_root: .debpkg
289292
maintainer: ${{ env.MAINTAINER }}
290-
version: ${{ github.ref_name }}
293+
version: ${{ steps.vars.outputs.app_version }}${{ steps.vars.outputs.deb_suffix }}
291294
arch: 'all'
292295
desc: '${{ env.EXTRA_DESC }}'
293296
license: 'Apache-2.0'
@@ -310,13 +313,13 @@ jobs:
310313
311314
# Prepare spec file for RPM
312315
sed -i 's/{{ NAME }}/${{ env.EXTRA_NAME }}/g' $spec_file
313-
sed -i 's/{{ VERSION }}/${{ github.ref_name }}/g' $spec_file
316+
sed -i 's/{{ VERSION }}/${{ steps.vars.outputs.app_version }}${{ steps.vars.outputs.rpm_suffix }}/g' $spec_file
314317
sed -i 's/{{ MAINTAINER }}/${{ env.MAINTAINER }}/g' $spec_file
315318
sed -i 's/{{ DESC }}/${{ env.EXTRA_DESC }}/g' $spec_file
316319
sed -i 's/{{ EXECUTOR_NAME }}/${{ env.APP_NAME }}/g' $spec_file
317-
sed -i 's/{{ EXECUTOR_VERSION }}/${{ github.ref_name }}/g' $spec_file
320+
sed -i 's/{{ EXECUTOR_VERSION }}/${{ steps.vars.outputs.app_version }}${{ steps.vars.outputs.rpm_suffix }}/g' $spec_file
318321
sed -i 's/{{ COLUMNAR_NAME }}/${{ env.COLUMNAR_NAME }}/g' $spec_file
319-
sed -i 's/{{ COLUMNAR_VERSION }}/v${{ env.COLUMNAR_VERSION }}/g' $spec_file
322+
sed -i 's/{{ COLUMNAR_VERSION }}/${{ env.COLUMNAR_VERSION }}/g' $spec_file
320323
321324
tar czf tmp.tar.gz "${{ env.EXTRA_NAME }}/"
322325
mkdir -p "$RPMBUILD_SOURCE_DIR"
@@ -331,16 +334,13 @@ jobs:
331334
run: |
332335
ls -lah ./*.rpm
333336
334-
version=$( echo ${{ github.ref_name }} | cut -c2- )
335-
rpm_path="./${{ env.EXTRA_NAME }}-v${version}-1.noarch.rpm"
336-
rpm_suffix=$( date +%y%m%d ).${GITHUB_SHA:0:7}
337-
cp $rpm_path "./${{ env.EXTRA_NAME }}-${version}_${rpm_suffix}-1.el7.noarch.rpm"
338-
cp $rpm_path "./${{ env.EXTRA_NAME }}-${version}_${rpm_suffix}-1.el8.noarch.rpm"
339-
mv $rpm_path "./${{ env.EXTRA_NAME }}-${version}_${rpm_suffix}-1.el9.noarch.rpm"
337+
version=${{ steps.vars.outputs.app_version }}${{ steps.vars.outputs.rpm_suffix }}
338+
rpm_path="./${{ env.EXTRA_NAME }}-${version}-1.noarch.rpm"
339+
cp $rpm_path "./${{ env.EXTRA_NAME }}-${version}-1.el7.noarch.rpm"
340+
cp $rpm_path "./${{ env.EXTRA_NAME }}-${version}-1.el8.noarch.rpm"
341+
mv $rpm_path "./${{ env.EXTRA_NAME }}-${version}-1.el9.noarch.rpm"
340342
341343
ls -lah ./*.deb
342-
deb_path="./${{ env.EXTRA_NAME }}_${version}_all.deb"
343-
mv "$deb_path" ./${{ env.EXTRA_NAME }}_${version}-$( date +%y%m%d )-${GITHUB_SHA:0:7}_all.deb
344344
345345
- uses: actions/upload-artifact@v3
346346
with:

0 commit comments

Comments
 (0)