Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
162fdefe
Commit
162fdefe
authored
Oct 28, 2020
by
ggelatti
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Allow semver versions for composer
parent
451fbf0c
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
1 deletion
+8
-1
app/services/packages/composer/version_parser_service.rb
app/services/packages/composer/version_parser_service.rb
+1
-1
changelogs/unreleased/240887-packages-composer-semver-not-fully-supported.yml
...d/240887-packages-composer-semver-not-fully-supported.yml
+5
-0
spec/services/packages/composer/version_parser_service_spec.rb
...services/packages/composer/version_parser_service_spec.rb
+2
-0
No files found.
app/services/packages/composer/version_parser_service.rb
View file @
162fdefe
...
...
@@ -9,7 +9,7 @@ module Packages
def
execute
if
@tag_name
.
present?
@tag_name
.
match
(
Gitlab
::
Regex
.
composer_package_version_regex
).
captures
[
0
]
@tag_name
[
0
]
==
'v'
?
@tag_name
[
1
..-
1
]
:
@tag_name
elsif
@branch_name
.
present?
branch_sufix_or_prefix
(
@branch_name
.
match
(
Gitlab
::
Regex
.
composer_package_version_regex
))
end
...
...
changelogs/unreleased/240887-packages-composer-semver-not-fully-supported.yml
0 → 100644
View file @
162fdefe
---
title
:
Allow semver versions in composer packages
merge_request
:
46301
author
:
type
:
fixed
spec/services/packages/composer/version_parser_service_spec.rb
View file @
162fdefe
...
...
@@ -19,9 +19,11 @@ RSpec.describe Packages::Composer::VersionParserService do
nil
|
'1.7.x'
|
'1.7.x-dev'
'v1.0.0'
|
nil
|
'1.0.0'
'v1.0'
|
nil
|
'1.0'
'v1.0.1+meta'
|
nil
|
'1.0.1+meta'
'1.0'
|
nil
|
'1.0'
'1.0.2'
|
nil
|
'1.0.2'
'1.0.2-beta2'
|
nil
|
'1.0.2-beta2'
'1.0.1+meta'
|
nil
|
'1.0.1+meta'
end
with_them
do
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment