dev pipeline update

Vitexus · Vitexus · commit 5db666e29e54 · 2025-08-29T02:45:45.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -16,3 +16,4 @@ composer.phar
 /debian/php-vitexsoftware-ease-html-widgets.debhelper.log
 /debian/php-vitexsoftware-ease-html-widgets-doc.substvars
 /debian/php-vitexsoftware-ease-html-widgets-doc.debhelper.log
+/debian/tmp/
diff --git a/debian/Jenkinsfile b/debian/Jenkinsfile
@@ -1,10 +1,15 @@
 #!groovy
 
-String[] distributions = ['debian:bookworm', 'debian:trixie', 'debian:forky', 'ubuntu:focal', 'ubuntu:jammy', 'ubuntu:noble']
 
-String vendor = 'vitexsoftware'
+String repoUrl = 'https://github.com/raspberrypi/rpi-imager.git'
+String repoBranch = 'qml' // scm.userRemoteConfigs[0].branch
+
+String[] architectures = ['amd64', 'aarch64', 'armhf']
+String[] distributions = ['debian:bullseye', 'debian:bookworm', 'ubuntu:focal', 'ubuntu:jammy'] // 'debian:buster'
+
+String imageVendor = 'vitexsoftware'
 String distribution = ''
-//String distroFamily = ''
+String architecture = ''
 String distroCodename = ''
 String ver = ''
 
@@ -14,74 +19,81 @@ properties([
 node() {
     ansiColor('xterm') {
         stage('SCM Checkout') {
-            checkout scm
+            checkout([$class: 'GitSCM', branches: [[name: '*/' + repoBranch ]], extensions: [], userRemoteConfigs: [[url: repoUrl]]])
+            def control = readFile(file:  env.WORKSPACE + '/debian/control')
+            def lines = control.readLines()
+            for (line in lines) {
+                if (line.trim()) {
+                    def (key,value) = line.split(': ').collect { it.trim() }
+                    if (key == 'Architecture') {
+                        if (value == 'any') {
+                            architectures = ['amd64', 'armhf', 'aarch64']
+                        } else {
+                            architectures = [value]
+                        }
+                    }
+                }
+            }
         }
     }
 }
 
-distributions.each {
-    distribution = it
+architectures.each {
+    architecture = it
 
-    println  "Dist:" + distribution
+    println 'Arch: ' + architecture
 
-    def dist = distribution.split(':')
-    distroCodename = dist[1]
+    distributions.each {
+        distribution = it
 
-    def buildImage = ''
+        println  'Dist:' + distribution
 
-    def artifacts = []
+        def String dist = distribution.split(':')
+        //      distroFamily = dist[0]
+        distroCodename = dist[1]
 
-    node {
-        ansiColor('xterm') {
-            stage('Checkout ' + distribution) {
-                checkout scm
-                buildImage = docker.image(vendor + '/' + distribution)
-                sh 'git checkout debian/changelog'
-                def version = sh (
-                    script: 'dpkg-parsechangelog --show-field Version',
-                    returnStdout: true
-                ).trim()
-                ver = version + '.' + env.BUILD_NUMBER  + '~' + distroCodename
-            }
-            stage('Build ' + distribution) {
-                buildImage.inside {
-                    sh 'dch -b -v ' + ver  + ' "' + env.BUILD_TAG  + '"'
-                    sh 'sudo apt-get update --allow-releaseinfo-change'
-                    sh 'sudo chown jenkins:jenkins ..'
-                    sh 'debuild-pbuilder  -i -us -uc -b'
-                    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'
-                    artifacts = sh (
-                        script: "cat debian/files | awk '{print \$1}'",
+        def String buildImage = ''
+
+        node(architecture) {
+            ansiColor('xterm') {
+                stage('Checkout ' + architecture + ' ' + distribution) {
+                    buildImage = docker.image(imageVendor + '/' + distribution)
+                    sh 'cd ' + env.WORKSPACE + '; ls -la; pwd'
+                    sh 'git checkout debian/changelog'
+                    def String pkgVer = sh(
+                        script: 'dpkg-parsechangelog --show-field Version',
                         returnStdout: true
-                    ).trim().split('\n')
+                    ).trim()
+                    ver = pkgVer + '~' + distroCodename + '~' + env.BUILD_NUMBER
+                }
+                stage('Build ' + architecture + ' ' + distribution) {
+                    buildImage.inside {
+                        sh 'dch -b -v ' + ver  + ' "' + env.BUILD_TAG  + '"'
+                        sh 'sudo apt-get update --allow-releaseinfo-change'
+                        //                        sh 'sudo apt install -y libgnutls28-dev'
+                        sh 'sudo chown jenkins:jenkins ..'
+                        sh 'debuild-pbuilder  -i -us -uc -b'
+                        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'
+                    }
                 }
-            }
 
-            stage('Test ' + distribution) {
-                buildImage.inside {
-                    def debconf_debug = 0 //Set to "5" or "developer" to debug debconf
-                    sh 'cd $WORKSPACE/dist/debian/ ; dpkg-scanpackages . /dev/null | gzip -9c > Packages.gz; cd $WORKSPACE'
-                    sh 'echo "deb [trusted=yes] file://///$WORKSPACE/dist/debian/ ./" | sudo tee /etc/apt/sources.list.d/local.list'
-                    sh 'sudo apt-get update --allow-releaseinfo-change'
-                    sh 'echo "INSTALATION"'
-                    artifacts.each { deb_file ->
-                        if (deb_file.endsWith('.deb')) {
-                            sh 'echo -e "${GREEN} installing ' + deb_file + ' on `lsb_release -sc` ${ENDCOLOR} "'
-                            sh 'sudo DEBIAN_FRONTEND=noninteractive DEBCONF_DEBUG=' + debconf_debug + ' apt-get -y install $WORKSPACE/dist/debian/' + deb_file
-                        }
+                stage('Test ' + architecture + ' ' + distribution) {
+                    buildImage.inside {
+                        def debconf_debug = 0 //Set to "5" or "developer" to debug debconf
+                        sh 'cd $WORKSPACE/dist/debian/ ; dpkg-scanpackages . /dev/null | gzip -9c > Packages.gz; cd $WORKSPACE'
+                        sh 'echo "deb [trusted=yes] file://///$WORKSPACE/dist/debian/ ./" | sudo tee /etc/apt/sources.list.d/local.list'
+                        sh 'sudo apt-get update --allow-releaseinfo-change'
+                        sh 'echo "INSTALATION"'
+                        sh 'IFS="\n\b"; for package in  `cat debian/files | 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 $WORKSPACE/dist/debian/$package ; done;'
+                        stash includes: 'dist/**', name: 'dist-' + distroCodename
                     }
                 }
-            }
-            stage('Copy artifacts ' + distribution ) {
-                buildImage.inside {
-                    artifacts.each { deb_file ->
-                        println "Copying artifact: " + deb_file
-                        archiveArtifacts artifacts: 'dist/debian/' + deb_file
-                        sh 'cp $WORKSPACE/dist/debian/' + deb_file + ' $WORKSPACE'
+                stage('Copy artifacts ' + architecture + ' ' + distribution ) {
+                    buildImage.inside {
+                        sh 'mv $WORKSPACE/dist/debian/*.deb $WORKSPACE'
                     }
                 }
             }
         }
     }
 }
-
diff --git a/debian/composer.json b/debian/composer.json
@@ -1,7 +1,6 @@
 {
   "name": "deb/ease-html-widgets",
   "description": "Addons for PHP Framework (debianized)",
-  "version": "1.1.0",
   "authors": [
     {
       "name": "Vítězslav Dvořák",
diff --git a/debian/php-vitexsoftware-ease-html-widgets.install b/debian/php-vitexsoftware-ease-html-widgets.install
@@ -1,2 +1,2 @@
 src/Ease/Html/Widgets/*.php     /usr/share/php/EaseHtmlWidgets/Widgets
-debian/composer.json 		/usr/share/php/EaseHtmlWidgets
+debian/tmp/composer.json 	/usr/share/php/EaseHtmlWidgets
diff --git a/debian/rules b/debian/rules
@@ -12,6 +12,6 @@
 #	dh_auto_install -- prefix=/usr
 
 override_dh_install:
-	jq '.version = "'`dpkg-parsechangelog | sed -n 's/^Version: //p'| sed 's/~.*//'`'"'  debian/composer.json |sponge debian/composer.json
+	mkdir -p debian/tmp
+	jq '.version = "'`dpkg-parsechangelog | sed -n 's/^Version: //p'| sed 's/~.*//'`'"'  debian/composer.json |sponge debian/tmp/composer.json
 	dh_install
-

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "deb/ease-html-widgets",`
`3`	`3`	`"description": "Addons for PHP Framework (debianized)",`
`4`		`- "version": "1.1.0",`
`5`	`4`	`"authors": [`
`6`	`5`	`{`
`7`	`6`	`"name": "Vítězslav Dvořák",`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`src/Ease/Html/Widgets/*.php /usr/share/php/EaseHtmlWidgets/Widgets`
`2`		`-debian/composer.json /usr/share/php/EaseHtmlWidgets`
	`2`	`+debian/tmp/composer.json /usr/share/php/EaseHtmlWidgets`