Skip to content

Commit 989920e

Browse files
author
Łukasz Spintzyk
committed
Add debian_revision to deb package version number and put version in filename
1 parent 25cb745 commit 989920e

2 files changed

Lines changed: 14 additions & 13 deletions

File tree

‎Jenkinsfile‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -37,27 +37,27 @@ pipeline {
3737
stage ('Build evdi-amd64.deb') {
3838
steps {
3939
dir('publish') {
40-
sh '''../src/ci/prepare_deb_package amd64'''
41-
sh '''../src/ci/test_deb_package evdi-amd64.deb'''
40+
sh '''../src/ci/prepare_deb_package amd64 ${BUILD_NUMBER}'''
41+
sh '''../src/ci/test_deb_package evdi-${EVDI_VERSION}-${BUILD_NUMBER}_amd64.deb'''
4242
}
4343
}
4444
}
4545
stage ('Build evdi-armhf.deb') {
4646
steps {
4747
dir('publish') {
48-
sh '''../src/ci/prepare_deb_package armhf'''
48+
sh '''../src/ci/prepare_deb_package armhf ${BUILD_NUMBER}'''
4949
catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
50-
sh '''../src/ci/test_deb_package evdi-armhf.deb'''
50+
sh '''../src/ci/test_deb_package evdi-${EVDI_VERSION}-${BUILD_NUMBER}_armhf.deb'''
5151
}
5252
}
5353
}
5454
}
5555
stage ('Build evdi-arm64.deb') {
5656
steps {
5757
dir('publish') {
58-
sh '''../src/ci/prepare_deb_package arm64'''
58+
sh '''../src/ci/prepare_deb_package arm64 ${BUILD_NUMBER}'''
5959
catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
60-
sh '''../src/ci/test_deb_package evdi-arm64.deb'''
60+
sh '''../src/ci/test_deb_package evdi-${EVDI_VERSION}-${BUILD_NUMBER}_arm64.deb'''
6161
}
6262
}
6363
}
@@ -90,15 +90,15 @@ pipeline {
9090
"files": [
9191
{
9292
"pattern": "publish/evdi-*amd64.deb",
93-
"target": "swbuilds-scratch/linux/evdi/amd64/${BUILD_DISPLAY_NAME}.deb"
93+
"target": "swbuilds-scratch/linux/evdi/amd64/${BUILD_DISPLAY_NAME}_amd64.deb"
9494
},
9595
{
9696
"pattern": "publish/evdi-*armhf.deb",
97-
"target": "swbuilds-scratch/linux/evdi/armhf/${BUILD_DISPLAY_NAME}.deb"
97+
"target": "swbuilds-scratch/linux/evdi/armhf/${BUILD_DISPLAY_NAME}_armhf.deb"
9898
},
9999
{
100100
"pattern": "publish/evdi-*arm64.deb",
101-
"target": "swbuilds-scratch/linux/evdi/arm64/${BUILD_DISPLAY_NAME}.deb"
101+
"target": "swbuilds-scratch/linux/evdi/arm64/${BUILD_DISPLAY_NAME}_arm64.deb"
102102
}
103103
]}''',
104104
failNoOp: true)

‎ci/prepare_deb_package‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,13 @@
33

44
set -eu
55

6-
if [[ ! $# -eq 1 ]]; then
7-
echo "Usage: ${BASH_SOURCE[0]##*/} <arch>"
6+
if [[ ! $# -eq 2 ]]; then
7+
echo "Usage: ${BASH_SOURCE[0]##*/} <arch> <debian_revision>"
88
exit 1
99
fi
1010

1111
readonly evdi_arch=${1:?}
12+
readonly debian_revision=${2:?}
1213

1314
create_evdi_deb_package()
1415
{
@@ -64,7 +65,7 @@ Depends: dkms, libdrm-dev, libc6-dev
6465
Package: evdi
6566
Architecture: $evdi_arch
6667
Description: $evdi_description
67-
Version: $evdi_version
68+
Version: $evdi_version-$debian_revision
6869
EOF
6970

7071
cat > "$control_dir/postinst" << EOF
@@ -131,7 +132,7 @@ EOF
131132
dpkg-deb --build EVDI
132133
)
133134

134-
mv "$temp_dir/EVDI.deb" "evdi-$evdi_arch.deb"
135+
mv "$temp_dir/EVDI.deb" "evdi-${evdi_version}-${debian_revision}_${evdi_arch}.deb"
135136

136137
rm -rf "$temp_dir"
137138
}

0 commit comments

Comments
 (0)