Use common build script

Jenkinsfile.centos7 → Jenkinsfile.el8

@@ -7,16 +7,12 @@ pipeline {
 		ansiColor('xterm')
 	}
 	agent {
-		label 'rpmbuild'
+		label 'rpm'
 	}
 	stages {
 		stage('Build') {
 			steps {
-				sh './build 7 golang'
-			}
-		}
-		stage('Sign') {
-			steps {
+				rpmBuild(8, 'golang')
 				rpmSign()
 			}
 		}
@@ -28,7 +24,7 @@ pipeline {
 				dir(path: 'SRPMS') {
 					archiveArtifacts(artifacts: '**/*.src.rpm', caseSensitive: true, onlyIfSuccessful: true, allowEmptyArchive: true)
 				}
-				rpmGithubRelease('centos7')
+				rpmGithubRelease('el8')
 			}
 		}
 	}

Jenkinsfile.centos8 → Jenkinsfile.el9

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

README.md

@@ -1,3 +1,3 @@
 # [wtf](https://github.com/wtfutil/wtf)
 
-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)

SPECS/wtf.spec

@@ -2,12 +2,12 @@
 
 %global gh_user     wtfutil
 %global gh_name     wtf
-%global gh_commit   f20465340a7937aa24b73f25fbf36cdccc415790
+%global gh_commit   ea7f6ed1ce0e3a96c7ce7aa337bfdae9cfc27a93
 %global gh_short    %(c=%{gh_commit}; echo ${c:0:7})
 
 Name:           wtfutil
-Version:        0.40.0
-Release:        1
+Version:        0.43.0
+Release:        1%{?dist}
 Summary:        A personal terminal-based dashboard utility, designed for displaying infrequently-needed, but very important, daily data.
 Group:          Applications/System
 License:        GNU
@@ -37,6 +37,9 @@ install -Dm0755 bin/wtfutil %{buildroot}%{_bindir}/wtfutil
 %{_bindir}/%{name}
 
 %changelog
+* Tue Jun 25 2024 Jamie Curnow <[email protected]> 0.43.0-1
+- v0.43.0
+
 * Wed Nov 3 2021 Jamie Curnow <[email protected]> 0.40.0-1
 - v0.40.0
 

rpm.json

@@ -2,6 +2,6 @@
   "publish": {
     "PACKAGE": "wtf",
     "GH_USER": "jc21-rpm",
-    "VERSION": "0.40.0"
+    "VERSION": "0.43.0"
   }
 }