Skip to content
Snippets Groups Projects
Commit 2a85e200 authored by Marin Jankovski's avatar Marin Jankovski Committed by Marin Jankovski
Browse files

Merge branch 'bump-chef-zero' into 'master'

Bump chef-zero to 4.7.0 to retain Ruby 2.1 compatibility

https://github.com/chef/chef-zero/pull/219

The release builds were failing:

```
               [Builder: chef-zero] I | gem `install chef-zero --version '4.5.0' --bindir '/opt/gitlab/embedded/bin' --no-ri --no-rdoc': 39.2814s
               [Builder: chef-zero] I | Build chef-zero: 39.2832s
The following shell command exited with status 1:

    $ CFLAGS=-I/opt/gitlab/embedded/include -O2 CPPFLAGS=-I/opt/gitlab/embedded/include -O2 CXXFLAGS=-I/opt/gitlab/embedded/include -O2 LDFLAGS=-Wl,-rpath,/opt/gitlab/embedded/lib -L/opt/gitlab/embedded/lib LD_RUN_PATH=/opt/gitlab/embedded/lib PATH=/opt/gitlab/bin:/opt/gitlab/embedded/bin:/root/gems/ruby/2.1.0/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin PKG_CONFIG_PATH=/opt/gitlab/embedded/lib/pkgconfig /opt/gitlab/embedded/bin/gem install chef-zero --version '4.5.0' --bindir '/opt/gitlab/embedded/bin' --no-ri --no-rdoc

Output:

    (nothing)

Error:

    ERROR:  Error installing chef-zero:
	rack requires Ruby version >= 2.2.2.
```

See merge request !852
parent a9c04cd3
No related branches found
No related tags found
No related merge requests found
...@@ -7,6 +7,9 @@ omnibus-gitlab repository. ...@@ -7,6 +7,9 @@ omnibus-gitlab repository.
- No changes - No changes
8.9.4
- Bump chef-zero to 4.7.0 to retain Ruby 2.1 compatibility 8495179
8.9.3 8.9.3
- IMPORTANT: Location of the trusted certificate directory has changed e2e7b - IMPORTANT: Location of the trusted certificate directory has changed e2e7b
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
# When changing this version, make sure that the verbosity went down. # When changing this version, make sure that the verbosity went down.
name "chef-zero" name "chef-zero"
default_version "4.5.0" default_version "4.7.0"
dependency "ruby" dependency "ruby"
dependency "rubygems" dependency "rubygems"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment