diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-06-23 18:09:32 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-06-23 18:09:32 +0300 |
| commit | cd81aadde2782c9fbb0ad69d5471bad792345120 (patch) | |
| tree | 627395de9daabae2f4471e8b965396f46e6335d8 /lib/gitlab/ci/runner_upgrade_check.rb | |
| parent | f46d20e5088ca9c58793e3b6044facfa74feb7ed (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/ci/runner_upgrade_check.rb')
| -rw-r--r-- | lib/gitlab/ci/runner_upgrade_check.rb | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/lib/gitlab/ci/runner_upgrade_check.rb b/lib/gitlab/ci/runner_upgrade_check.rb index f265a40eb8b..bc37affdf3f 100644 --- a/lib/gitlab/ci/runner_upgrade_check.rb +++ b/lib/gitlab/ci/runner_upgrade_check.rb @@ -17,14 +17,11 @@ module Gitlab end def check_runner_upgrade_status(runner_version) - return :invalid unless runner_version - - releases = RunnerReleases.instance.releases - orig_runner_version = runner_version runner_version = ::Gitlab::VersionInfo.parse(runner_version) unless runner_version.is_a?(::Gitlab::VersionInfo) - raise ArgumentError, "'#{orig_runner_version}' is not a valid version" unless runner_version.valid? + return :invalid unless runner_version.valid? + releases = RunnerReleases.instance.releases gitlab_minor_version = @gitlab_version.without_patch available_releases = releases |