diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 625a247..66dbab5 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 ; }' + - 'bundle exec rake ood_packaging:buildbox:pull || true' - bundle exec rake ood_packaging:buildbox:build parallel: matrix: diff --git a/Gemfile.lock b/Gemfile.lock index 70d0ffc..06a5c66 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - ood_packaging (0.16.1) + ood_packaging (0.16.2) rake (~> 13.0.1) GEM diff --git a/lib/ood_packaging/version.rb b/lib/ood_packaging/version.rb index daeb64c..c24db6b 100644 --- a/lib/ood_packaging/version.rb +++ b/lib/ood_packaging/version.rb @@ -2,7 +2,7 @@ # Version code for OodPackaging module OodPackaging - VERSION = '0.16.1' + VERSION = '0.16.2' PACKAGE_VERSION = { 'ondemand-release' => { '(ubuntu|debian)' => '4.0.0', @@ -12,7 +12,7 @@ module OodPackaging '(ubuntu|debian)' => '5', 'default' => '1-8' }, - 'ondemand-runtime' => '4.0.1', + 'ondemand-runtime' => '4.0.2', 'scl-utils' => '2.0.3', 'passenger' => '6.0.23', 'cjose' => '0.6.1', diff --git a/packages/ondemand-runtime/rpm/ondemand-runtime.spec b/packages/ondemand-runtime/rpm/ondemand-runtime.spec index 933b9c6..e20914c 100644 --- a/packages/ondemand-runtime/rpm/ondemand-runtime.spec +++ b/packages/ondemand-runtime/rpm/ondemand-runtime.spec @@ -31,7 +31,6 @@ Summary: Package that handles %{scl} Software Collection. License: MIT BuildRequires: scl-utils-build -Requires: scl-utils Obsoletes: ondemand-python %description @@ -39,6 +38,7 @@ Package shipping essential scripts to work with %{scl} Software Collection. %package -n ondemand-build Summary: Package shipping basic build configuration +Requires: scl-utils Requires: scl-utils-build Requires: curl Requires: make diff --git a/packages/passenger/rpm/passenger.spec b/packages/passenger/rpm/passenger.spec index abdc56a..ffecda3 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 4.0.1 +%define runtime_version 4.0.2 %global nginx_user %{?scl_prefix}nginx %global nginx_group %{nginx_user}