Use common build script

jc21-rpm · Jun 25, 2024 · b872e88 · b872e88
1 parent d22923e
commit b872e88
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 145 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,4 +1,3 @@
 # [tmux](https://github.com/tmux/tmux)
 
-Builds for Centos 6/7 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/tmux.spec b/SPECS/tmux.spec
@@ -1,8 +1,8 @@
 %global _hardened_build 1
 
 Name:           tmux
-Version:        3.1b
-Release:        1
+Version:        3.4
+Release:        1%{?dist}
 Summary:        A terminal multiplexer
 
 # Most of the source is ISC licensed; some of the files in compat/ are 2 and
@@ -65,6 +65,9 @@ fi
 %{_datadir}/bash-completion/completions/tmux
 
 %changelog
+* Tue Jun 25 2024 Jamie Curnow <jc@jc21.com> - 3.4-1
+- v3.4
+
 * Tue May 05 2020 Jamie Curnow <jc@jc21.com> - 3.1b-1
 - v3.1b
 

diff --git a/build b/build
diff --git a/rpm.json b/rpm.json
@@ -2,6 +2,6 @@
   "publish": {
     "PACKAGE": "tmux",
     "GH_USER": "jc21-rpm",
-    "VERSION": "3.1b"
+    "VERSION": "3.4"
   }
 }