diff --git a/Jenkinsfile.centos7 b/Jenkinsfile.el8 similarity index 86% rename from Jenkinsfile.centos7 rename to Jenkinsfile.el8 index c47d0ce..8dc0736 100644 --- a/Jenkinsfile.centos7 +++ b/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 b/Jenkinsfile.el9 similarity index 86% rename from Jenkinsfile.centos8 rename to Jenkinsfile.el9 index c5c3579..35b0344 100644 --- a/Jenkinsfile.centos8 +++ b/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 index 462ef07..f6f156d 100644 --- 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 index 4cac3b9..d792b61 100644 --- 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 - 3.4-1 +- v3.4 + * Tue May 05 2020 Jamie Curnow - 3.1b-1 - v3.1b diff --git a/build b/build deleted file mode 100755 index e160f58..0000000 --- a/build +++ /dev/null @@ -1,126 +0,0 @@ -#!/bin/bash - -################################################## -# -# ./build CENTOS_VERSION [DOCKER_TAG] [SPEC_FILE] -# -# If no docker tag, `latest` is used -# If no Spec file (without .spec), all spec files -# found will be built. -# -# ie: -# ./build 7 golang php-pecl-memcache_php72_php73 -# -################################################## - -CWD=`pwd` -CYAN='\E[1;36m' -RED='\E[1;31m' -YELLOW='\E[1;33m' -GREEN='\E[1;32m' -BLUE='\E[1;34m' - -CENTOS_VERSION=$1 -if [ "$CENTOS_VERSION" == "" ]; then - echo -en "${RED}ERROR: " - tput sgr0 - echo -e "You must specify a Centos version to build for, either 6 or 7" - echo "ie: ./build 7" - exit 1 -fi - -DOCKER_TAG=$2 -if [ "$DOCKER_TAG" == "" ]; then - DOCKER_TAG=latest -fi - -SPECIFIC_SPEC_FILE=$3 - -# Loop over all Specs in the SPECS folder -for SPECFILE in SPECS/*.spec; do - PACKAGE=${SPECFILE#"SPECS/"} - PACKAGE=${PACKAGE%".spec"} - - if [ "${SPECIFIC_SPEC_FILE}" == "" ] || [ "${SPECIFIC_SPEC_FILE}" == "${PACKAGE}" ]; then - echo -e "${BLUE}❯ ${GREEN}Building ${CYAN}${PACKAGE} ${GREEN}for Centos ${CENTOS_VERSION}" - tput sgr0 - - # Make sure docker exists - if hash docker 2>/dev/null; then - # Generate a Docker image based on env vars and centos version, for use both manually and in CI - eval "DOCKER_IMAGE=\$\{DOCKER_RPMBUILD_EL${CENTOS_VERSION}:-jc21/rpmbuild-centos${CENTOS_VERSION}\}" - eval "DOCKER_IMAGE=${DOCKER_IMAGE}" - - # Folder setup - echo -e "${BLUE}❯ ${YELLOW}Folder setup" - tput sgr0 - rm -rf RPMS/* SRPMS/* - mkdir -p {RPMS,SRPMS,DEPS,SPECS,SOURCES} - chmod -R 777 {RPMS,SRPMS} - - # Pull latest builder image - echo -e "${BLUE}❯ ${YELLOW}Pulling docker image: ${DOCKER_IMAGE}:${DOCKER_TAG}" - tput sgr0 - docker pull ${DOCKER_IMAGE}:${DOCKER_TAG} - - # Use the build to change the ownership of folders - echo -e "${BLUE}❯ ${YELLOW}Temporarily changing ownership" - tput sgr0 - docker run --rm \ - -v ${CWD}:/home/rpmbuilder/rpmbuild \ - ${DOCKER_IMAGE}:${DOCKER_TAG} \ - sudo chown -R rpmbuilder:rpmbuilder /home/rpmbuilder/rpmbuild - - # Do the build - echo -e "${BLUE}❯ ${YELLOW}Building ${PACKAGE}" - tput sgr0 - - # If cpp11, use a special command - # This is a convoluted solution I know. - DOCKER_COMMAND="/bin/build-spec -o -r /home/rpmbuilder/rpmbuild/DEPS/*/*.rpm -- /home/rpmbuilder/rpmbuild/SPECS/${PACKAGE}.spec" - ADDITIONAL_MOUNT="" - if [ "$DOCKER_TAG" == "cpp11" ]; then - TMPFILE=`mktemp /tmp/rpmbuild.XXXXXXXX` - chmod 777 "${TMPFILE}" - echo "source /opt/rh/devtoolset-2/enable && /bin/build-spec -o -p python-sphinx -p python-devel -r \"/home/rpmbuilder/rpmbuild/DEPS/*/*.rpm\" /home/rpmbuilder/rpmbuild/SPECS/${PACKAGE}.spec" >> "${TMPFILE}" - ADDITIONAL_MOUNT="-v ${TMPFILE}:/tmp/runme.sh" - DOCKER_COMMAND="bash /tmp/runme.sh" - fi - - # Docker Run - docker run --rm \ - --name rpmbuild-${BUILD_TAG:-centos${CENTOS_VERSION}-${PACKAGE}} \ - -v ${CWD}/DEPS:/home/rpmbuilder/rpmbuild/DEPS \ - -v ${CWD}/RPMS:/home/rpmbuilder/rpmbuild/RPMS \ - -v ${CWD}/SRPMS:/home/rpmbuilder/rpmbuild/SRPMS \ - -v ${CWD}/SPECS:/home/rpmbuilder/rpmbuild/SPECS \ - -v ${CWD}/SOURCES:/home/rpmbuilder/rpmbuild/SOURCES \ - ${ADDITIONAL_MOUNT} \ - -e GOPROXY=${GOPROXY} \ - ${DOCKER_IMAGE}:${DOCKER_TAG} \ - ${DOCKER_COMMAND} - - BUILD_SUCCESS=$? - - # Change ownership back - echo -e "${BLUE}❯ ${YELLOW}Reverting ownership" - tput sgr0 - docker run --rm \ - -v ${CWD}:/home/rpmbuilder/rpmbuild \ - ${DOCKER_IMAGE}:${DOCKER_TAG} \ - sudo chown -R `id -u`:`id -g` /home/rpmbuilder/rpmbuild - - # do we need to exit the loop? - if [ $BUILD_SUCCESS -ne 0 ]; then - echo -e "${BLUE}❯ ${RED}Exiting due to error" - tput sgr0 - exit ${BUILD_SUCCESS} - fi - else - echo -en "${RED}ERROR: " - tput sgr0 - echo "Docker command is not available" - exit 1 - fi - fi -done diff --git a/rpm.json b/rpm.json index f935e81..90e4a67 100644 --- a/rpm.json +++ b/rpm.json @@ -2,6 +2,6 @@ "publish": { "PACKAGE": "tmux", "GH_USER": "jc21-rpm", - "VERSION": "3.1b" + "VERSION": "3.4" } }