Skip to content

Commit

Permalink
Remove SCL runtime dependency
Browse files Browse the repository at this point in the history
  • Loading branch information
treydock committed Nov 10, 2024
1 parent accfd40 commit c1573ca
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PATH
remote: .
specs:
ood_packaging (0.16.1)
ood_packaging (0.16.2)
rake (~> 13.0.1)

GEM
Expand Down
4 changes: 2 additions & 2 deletions lib/ood_packaging/version.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand All @@ -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',
Expand Down
2 changes: 1 addition & 1 deletion packages/ondemand-runtime/rpm/ondemand-runtime.spec
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,14 @@ Summary: Package that handles %{scl} Software Collection.
License: MIT

BuildRequires: scl-utils-build
Requires: scl-utils
Obsoletes: ondemand-python

%description
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
Expand Down
2 changes: 1 addition & 1 deletion packages/passenger/rpm/passenger.spec
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down

0 comments on commit c1573ca

Please sign in to comment.