Commit ccb664f1 authored by Samir Noir's avatar Samir Noir 🧀
Browse files

Remove Grid5000::VERSION

parent 5dac0f33
Pipeline #165878 waiting for manual action with stages
in 20 minutes and 10 seconds
......@@ -25,14 +25,13 @@ class RootController < ResourcesController
def links_for_item(item)
links = super(item)
item['release'] = Grid5000::VERSION
item['timestamp'] = Time.now.to_i
%w[users].each do |rel|
links.push({
'rel' => rel,
'type' => api_media_type(:g5kcollectionjson),
'href' => uri_to(File.join(resource_path(item['uid']), rel))
})
'rel' => rel,
'type' => api_media_type(:g5kcollectionjson),
'href' => uri_to(File.join(resource_path(item['uid']), rel))
})
end
links
end
......
......@@ -25,7 +25,6 @@ when 'console'
require 'rails/commands'
when 'server'
require 'thin'
require_relative '../lib/grid5000/version'
ENV['PORT'] ||= '8000'
rackup_file = ::File.expand_path('../config.ru', __dir__)
argv = ARGV
......@@ -34,7 +33,6 @@ when 'server'
argv << ['--max-persistent-conns', '200'] unless ARGV.include?('--max-persistent-conns')
argv << ['-a', '::'] unless ARGV.include?('-a')
argv << ['-e', 'production'] unless ARGV.include?('-e')
argv << ['--tag', "g5k-api-#{Grid5000::VERSION}"] unless ARGV.include?('--tag')
Thin::Runner.new(argv.flatten).run!
warn 'Finished running thin'
else
......
......@@ -14,7 +14,6 @@
# Load the rails application
require File.expand_path('application', __dir__)
require 'grid5000/version'
# Initialize the rails application
Api::Application.initialize!
......@@ -40,7 +40,7 @@ Api::Application.configure do
# Use a different logger for distributed setups
# config.logger = Syslogger.new(
# "g5k-api-#{Grid5000::VERSION}",
# "g5k-api-production",
# Syslog::LOG_PID,
# Syslog::LOG_LOCAL0
# )
......
# Copyright (c) 2009-2011 Cyril Rohr, INRIA Rennes - Bretagne Atlantique
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
module Grid5000
VERSION = "3.9.7".freeze
end
......@@ -24,7 +24,6 @@ describe RootController do
'type' => 'grid',
'uid' => 'grid5000',
'version' => '8a562420c9a659256eeaafcfd89dfa917b5fb4d0',
'release' => Grid5000::VERSION,
'timestamp' => @now.to_i,
'links' => [
{ 'rel' => 'environments', 'href' => '/environments', 'type' => 'application/vnd.grid5000.collection+json' },
......@@ -46,7 +45,6 @@ describe RootController do
'type' => 'grid',
'uid' => 'grid5000',
'version' => '8a562420c9a659256eeaafcfd89dfa917b5fb4d0',
'release' => Grid5000::VERSION,
'timestamp' => @now.to_i,
'links' => [
{ 'rel' => 'environments', 'href' => '/sid/environments', 'type' => 'application/vnd.grid5000.collection+json' },
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment