Use common build script

jc21-rpm · Jun 25, 2024 · 0faee3a · 0faee3a
1 parent 4c8e118
commit 0faee3a
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 133 deletions.
diff --git a/Jenkinsfile.centos7 → Jenkinsfile.el8 b/Jenkinsfile.centos7 → Jenkinsfile.el8
@@ -7,16 +7,12 @@ pipeline {
 		ansiColor('xterm')
 	}
 	agent {
-		label 'rpmbuild'
+		label 'rpm'
 	}
 	stages {
 		stage('Build') {
 			steps {
-				sh './build 7'
-			}
-		}
-		stage('Sign') {
-			steps {
+				rpmBuild(8)
 				rpmSign()
 			}
 		}
@@ -28,7 +24,7 @@ pipeline {
 				dir(path: 'SRPMS') {
 					archiveArtifacts(artifacts: '**/*.src.rpm', caseSensitive: true, onlyIfSuccessful: true, allowEmptyArchive: true)
 				}
-				rpmGithubRelease('centos7')
+				rpmGithubRelease('el8')
 			}
 		}
 	}

diff --git a/Jenkinsfile.centos8 → Jenkinsfile.el9 b/Jenkinsfile.centos8 → Jenkinsfile.el9
@@ -7,16 +7,12 @@ pipeline {
 		ansiColor('xterm')
 	}
 	agent {
-		label 'rpmbuild'
+		label 'rpm'
 	}
 	stages {
 		stage('Build') {
 			steps {
-				sh './build 8'
-			}
-		}
-		stage('Sign') {
-			steps {
+				rpmBuild(9)
 				rpmSign()
 			}
 		}
@@ -28,7 +24,7 @@ pipeline {
 				dir(path: 'SRPMS') {
 					archiveArtifacts(artifacts: '**/*.src.rpm', caseSensitive: true, onlyIfSuccessful: true, allowEmptyArchive: true)
 				}
-				rpmGithubRelease('centos8')
+				rpmGithubRelease('el9')
 			}
 		}
 	}

diff --git a/README.md b/README.md
@@ -1,3 +1,3 @@
 # [ncdu](https://dev.yorhel.nl/ncdu)
 
-Builds for Centos 7/8 hosted on [yum.jc21.com](https://yum.jc21.com)
+Builds for Enterprise Linux hosted on [yum.jc21.com](https://yum.jc21.com)
diff --git a/SPECS/ncdu.spec b/SPECS/ncdu.spec
@@ -1,8 +1,8 @@
 %global debug_package %{nil}
 
 Name:           ncdu
-Version:        2.2.1
-Release:        1
+Version:        2.4
+Release:        1%{?dist}
 Summary:        Ncdu is a disk usage analyzer with an ncurses interface
 Group:          Applications/System
 License:        GPLv2
@@ -32,5 +32,8 @@ rm -rf %{buildroot}
 /usr/bin/%{name}
 
 %changelog
+* Tue Jun 25 2024 Jamie Curnow <jc@jc21.com> - 2.4-1
+- v2.4
+
 * Thu Dec 8 2022 Jamie Curnow <jc@jc21.com> - 2.2.1-1
 - Initial spec
diff --git a/build b/build
diff --git a/rpm.json b/rpm.json
@@ -2,6 +2,6 @@
   "publish": {
     "PACKAGE": "ncdu",
     "GH_USER": "jc21-rpm",
-    "VERSION": "2.2.1"
+    "VERSION": "2.4"
   }
 }