From ecaec7cb3a01f4922849346a46551fed6d8339eb Mon Sep 17 00:00:00 2001
From: treydock <tdockendorf@osc.edu>
Date: Tue, 6 Feb 2024 14:24:44 -0500
Subject: [PATCH] Fix Ruby version for ondemand-runtime (#267)

* Fix Ruby version for ondemand-runtime

* Pull first

* Use latest runtime with passenger RPM build

* Avoid duplicate repo update
---
 .gitlab-ci.yml                                      | 2 +-
 lib/ood_packaging/version.rb                        | 2 +-
 packages/ondemand-runtime/rpm/ondemand-runtime.spec | 3 ++-
 packages/passenger/rpm/passenger.spec               | 2 +-
 release-manifest.yaml                               | 2 +-
 release.py                                          | 4 +---
 6 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7dbb04e..39daf32 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -25,7 +25,7 @@ build-image:
     - if: '$CI_COMMIT_BRANCH !~ /^(main|[0-9]\.[0-9])$/ && $CI_COMMIT_TAG == null'
     - if: $CI_COMMIT_TAG && $CI_COMMIT_TAG !~ /v[0-9].+/
   script:
-    - '[ -z ${CI_COMMIT_TAG+x} ] || bundle exec rake ood_packaging:buildbox:pull || true'
+    - '[ -z ${CI_COMMIT_TAG+x} ] && { bundle exec rake ood_packaging:buildbox:pull || true ; }'
     - bundle exec rake ood_packaging:buildbox:build
   parallel:
     matrix:
diff --git a/lib/ood_packaging/version.rb b/lib/ood_packaging/version.rb
index 2222e38..b8a4287 100644
--- a/lib/ood_packaging/version.rb
+++ b/lib/ood_packaging/version.rb
@@ -12,7 +12,7 @@ module OodPackaging
       '(ubuntu|debian)' => '3',
       'default'         => '1-8'
     },
-    'ondemand-runtime'        => '3.1.4',
+    'ondemand-runtime'        => '3.1.5',
     'scl-utils'               => '2.0.3',
     'passenger'               => '6.0.17',
     'cjose'                   => '0.6.1',
diff --git a/packages/ondemand-runtime/rpm/ondemand-runtime.spec b/packages/ondemand-runtime/rpm/ondemand-runtime.spec
index c7ffa43..e5c3beb 100644
--- a/packages/ondemand-runtime/rpm/ondemand-runtime.spec
+++ b/packages/ondemand-runtime/rpm/ondemand-runtime.spec
@@ -8,13 +8,14 @@
 %global ruby ruby
 %global nodejs nodejs
 %global apache httpd
+%global ruby_version 3.1
 %endif
 %if 0%{?amzn} == 2023
 %global ruby ruby3.2
 %global nodejs nodejs
 %global apache httpd
+%global ruby_version 3.2
 %endif
-%global ruby_version 3.0
 %global ondemand_gem_home %{_datadir}/gems/%{ruby_version}
 %global ondemand_apps_gem_home %{ondemand_gem_home}/apps
 %global ondemand_core_gem_home %{ondemand_gem_home}/ondemand
diff --git a/packages/passenger/rpm/passenger.spec b/packages/passenger/rpm/passenger.spec
index a9904e8..2bf1002 100644
--- a/packages/passenger/rpm/passenger.spec
+++ b/packages/passenger/rpm/passenger.spec
@@ -6,7 +6,7 @@
 %define release_version %{package_release}
 %define ngix_release_version 1
 
-%define runtime_version 3.1.4
+%define runtime_version 3.1.5
 
 %global  nginx_user          %{?scl_prefix}nginx
 %global  nginx_group         %{nginx_user}
diff --git a/release-manifest.yaml b/release-manifest.yaml
index f651036..58f57c7 100644
--- a/release-manifest.yaml
+++ b/release-manifest.yaml
@@ -1,6 +1,6 @@
 major: '3.1'
 full: '3.1.0'
-runtime: '3.1.4'
+runtime: '3.1.5'
 
 # release
 ondemand-release:
diff --git a/release.py b/release.py
index 2d0a109..9219119 100755
--- a/release.py
+++ b/release.py
@@ -156,9 +156,7 @@ def main():
                     rpms.append(p)
             rpms_released = release_packages(rpms, host, rpm_path, args.pkey, args.force)
             srpms_released = release_packages(srpms, host, srpm_path, args.pkey, args.force)
-            if rpms_released and update:
-                update_repo(host, release, dist, arch, release_type, args.pkey)
-            if srpms_released and update:
+            if (rpms_released or srpms_released) and update:
                 update_repo(host, release, dist, arch, release_type, args.pkey)
 
 if __name__ == '__main__':