Revert "Add spring support to rails/rake binstubs"
This reverts commit 28f82411be
.
This commit is contained in:
parent
c9ec6e4e94
commit
30d7535b17
|
@ -24,11 +24,8 @@ static-analysis:
|
|||
extends:
|
||||
- .static-analysis-base
|
||||
- .static-analysis:rules:ee-and-foss
|
||||
- .use-pg12
|
||||
stage: test
|
||||
parallel: 4
|
||||
variables:
|
||||
SETUP_DB: "true"
|
||||
script:
|
||||
- run_timed_command "retry yarn install --frozen-lockfile"
|
||||
- scripts/static-analysis
|
||||
|
@ -38,6 +35,17 @@ static-analysis:
|
|||
paths:
|
||||
- tmp/feature_flags/
|
||||
|
||||
static-analysis-with-database:
|
||||
extends:
|
||||
- .static-analysis-base
|
||||
- .static-analysis:rules:ee-and-foss
|
||||
- .use-pg12
|
||||
stage: test
|
||||
script:
|
||||
- bundle exec rake lint:static_verification_with_database
|
||||
variables:
|
||||
SETUP_DB: "true"
|
||||
|
||||
static-analysis as-if-foss:
|
||||
extends:
|
||||
- static-analysis
|
||||
|
|
|
@ -1,9 +1,4 @@
|
|||
#!/usr/bin/env ruby
|
||||
begin
|
||||
load File.expand_path('../spring', __FILE__)
|
||||
rescue LoadError => e
|
||||
raise unless e.message.include?('spring')
|
||||
end
|
||||
APP_PATH = File.expand_path('../config/application', __dir__)
|
||||
require_relative '../config/boot'
|
||||
require 'rails/commands'
|
||||
|
|
5
bin/rake
5
bin/rake
|
@ -1,9 +1,4 @@
|
|||
#!/usr/bin/env ruby
|
||||
begin
|
||||
load File.expand_path('../spring', __FILE__)
|
||||
rescue LoadError => e
|
||||
raise unless e.message.include?('spring')
|
||||
end
|
||||
require_relative '../config/boot'
|
||||
require 'rake'
|
||||
Rake.application.run
|
||||
|
|
|
@ -31,7 +31,7 @@ def all_success?
|
|||
end
|
||||
|
||||
def all_stderr_empty?
|
||||
results.all? { |result| stderr_empty_ignoring_spring(result) }
|
||||
results.all? { |result| result.stderr.empty? }
|
||||
end
|
||||
|
||||
def failed_results
|
||||
|
@ -40,22 +40,9 @@ def failed_results
|
|||
|
||||
def warned_results
|
||||
results.select do |result|
|
||||
result.status.success? && !stderr_empty_ignoring_spring(result)
|
||||
result.status.success? && !result.stderr.empty?
|
||||
end
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
# NOTE: This is sometimes required instead of just calling `result.stderr.empty?`, if we
|
||||
# want to ignore the spring "Running via Spring preloader..." output to STDERR.
|
||||
# The `Spring.quiet=true` method which spring supports doesn't work, because it doesn't
|
||||
# work to make it quiet when using spring binstubs (the STDERR is printed by `bin/spring`
|
||||
# itself when first required, so there's no opportunity to set Spring.quiet=true).
|
||||
# This should probably be opened as a bug against Spring, with a pull request to support a
|
||||
# `SPRING_QUIET` env var as well.
|
||||
def stderr_empty_ignoring_spring(result)
|
||||
result.stderr.empty? || result.stderr =~ /\ARunning via Spring preloader in process [0-9]+\Z/
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
@ -12,6 +12,13 @@ unless Rails.env.production?
|
|||
dev:load
|
||||
] do
|
||||
Gitlab::Utils::Override.verify!
|
||||
end
|
||||
|
||||
desc "GitLab | Lint | Static verification with database"
|
||||
task static_verification_with_database: %w[
|
||||
lint:static_verification_env
|
||||
dev:load
|
||||
] do
|
||||
Gitlab::Utils::DelegatorOverride.verify!
|
||||
end
|
||||
|
||||
|
|
Loading…
Reference in a new issue