From 1bcc1293e6d4ec0a881d1e2317a70cfaca03235c Mon Sep 17 00:00:00 2001 From: Daniel Hilst Selli <392820+dhilst@users.noreply.github.com> Date: Thu, 22 Jan 2026 11:28:14 -0300 Subject: [PATCH] revert: Revert changes in github workflow, versions and build scripts Signed-off-by: Daniel Hilst Selli <392820+dhilst@users.noreply.github.com> --- .github/workflows/xcat_test.yml | 14 -------------- Release | 2 +- Version | 2 +- makerpm | 2 +- 4 files changed, 3 insertions(+), 17 deletions(-) diff --git a/.github/workflows/xcat_test.yml b/.github/workflows/xcat_test.yml index 095b731ca..a5022db46 100644 --- a/.github/workflows/xcat_test.yml +++ b/.github/workflows/xcat_test.yml @@ -10,17 +10,3 @@ jobs: run: sudo apt-get install -y fakeroot reprepro devscripts debhelper libcapture-tiny-perl libjson-perl libsoap-lite-perl libdbi-perl libcgi-pm-perl quilt openssh-server dpkg looptools genometools software-properties-common - name: Run tests run: perl github_action_xcat_test.pl - - # Note: github_action_xcat_test.pl is debian dependent, we - # need to generalize it before running on EL - # xcat_pr_test_el10: - # runs-on: ubuntu-latest - # container: - # image: rockylinux/rockylinux:10 - # timeout-minutes: 60 - # steps: - # - uses: actions/checkout@v4 - # - name: Install dependencies - # run: dnf install -y fakeroot perl-Capture-Tiny perl-JSON perl-SOAP-Lite perl-DBI perl-CGI quilt openssh looptools - # - name: Run tests - # run: perl github_action_xcat_test.pl diff --git a/Release b/Release index b9551fd7e..a33a0ed75 100644 --- a/Release +++ b/Release @@ -1 +1 @@ -RC1 +snap000000000000 diff --git a/Version b/Version index 4a36342fc..d76bd2ba3 100644 --- a/Version +++ b/Version @@ -1 +1 @@ -3.0.0 +2.17.0 diff --git a/makerpm b/makerpm index 0e0fe5d85..c65a02da3 100755 --- a/makerpm +++ b/makerpm @@ -269,7 +269,7 @@ else # linux echo "Error: rpmbuild does not appear to be installed or working." exit 2 fi - RPMROOT="/root/rpmbuild" + RPMROOT=`rpmbuild --eval '%_topdir' xCATsn/xCATsn.spec` if [ $? -gt 0 ]; then echo "Error: Could not determine rpmbuild's root directory." exit 2