Skip to content

Commit 9faccea

Browse files
committed
Jenkinsfile update
1 parent ae1a77b commit 9faccea

File tree

3 files changed

+20
-6
lines changed

3 files changed

+20
-6
lines changed

debian/Jenkinsfile

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,18 @@ distributions.each {
2525
println "Dist:" + distribution
2626

2727
def dist = distribution.split(':')
28-
// distroFamily = dist[0]
2928
distroCodename = dist[1]
3029

3130
def buildImage = ''
3231

32+
def artifacts = []
33+
3334
node {
3435
ansiColor('xterm') {
3536
stage('Checkout ' + distribution) {
37+
checkout scm
3638
buildImage = docker.image(vendor + '/' + distribution)
37-
sh 'git checkout debian/changelog'
39+
sh 'git checkout debian/changelog'
3840
def version = sh (
3941
script: 'dpkg-parsechangelog --show-field Version',
4042
returnStdout: true
@@ -48,6 +50,10 @@ distributions.each {
4850
sh 'sudo chown jenkins:jenkins ..'
4951
sh 'debuild-pbuilder -i -us -uc -b'
5052
sh 'mkdir -p $WORKSPACE/dist/debian/ ; rm -rf $WORKSPACE/dist/debian/* ; for deb in $(cat debian/files | awk \'{print $1}\'); do mv "../$deb" $WORKSPACE/dist/debian/; done'
53+
artifacts = sh (
54+
script: "cat debian/files | awk '{print \$1}'",
55+
returnStdout: true
56+
).trim().split('\n')
5157
}
5258
}
5359

@@ -58,12 +64,20 @@ distributions.each {
5864
sh 'echo "deb [trusted=yes] file://///$WORKSPACE/dist/debian/ ./" | sudo tee /etc/apt/sources.list.d/local.list'
5965
sh 'sudo apt-get update --allow-releaseinfo-change'
6066
sh 'echo "INSTALATION"'
61-
sh 'IFS="\n\b"; for package in `ls $WORKSPACE/dist/debian/ | grep .deb | grep -v dbgsym | awk -F_ \'{print \$1}\'` ; do echo -e "${GREEN} installing ${package} on `lsb_release -sc` ${ENDCOLOR} " ; sudo DEBIAN_FRONTEND=noninteractive DEBCONF_DEBUG=' + debconf_debug + ' apt-get -y install $package ; done;'
62-
stash includes: 'dist/**', name: 'dist-' + distroCodename
67+
artifacts.each { deb_file ->
68+
if (deb_file.endsWith('.deb')) {
69+
sh 'echo -e "${GREEN} installing ' + deb_file + ' on `lsb_release -sc` ${ENDCOLOR} "'
70+
sh 'sudo DEBIAN_FRONTEND=noninteractive DEBCONF_DEBUG=' + debconf_debug + ' apt-get -y install $WORKSPACE/dist/debian/' + deb_file
71+
}
72+
}
6373
}
6474
}
6575
stage('Copy artifacts ' + distribution ) {
6676
buildImage.inside {
77+
artifacts.each { deb_file ->
78+
println "Copying artifact: " + deb_file
79+
archiveArtifacts artifacts: 'dist/debian/' + deb_file
80+
}
6781
sh 'mv $WORKSPACE/dist/debian/*.deb $WORKSPACE'
6882
}
6983
}

nbproject/project.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ auxiliary.org-netbeans-modules-php-phpunit.test_2e_run_2e_all=false
1212
auxiliary.org-netbeans-modules-php-phpunit.test_2e_run_2e_phpunit_2e_only=false
1313
file.reference.php-subreg-tests=tests
1414
include.path=${php.global.include.path}
15-
php.version=PHP_70
15+
php.version=PHP_83
1616
source.encoding=UTF-8
1717
src.dir=.
1818
tags.asp=false

nbproject/project.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<type>org.netbeans.modules.php.project</type>
44
<configuration>
55
<data xmlns="http://www.netbeans.org/ns/php-project/1">
6-
<name>php-subreg</name>
6+
<name>php-spojenet-subreg</name>
77
</data>
88
</configuration>
99
</project>

0 commit comments

Comments
 (0)