ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

maven_artifact: Adjust path for time stamped SNAPSHOT versions (#713) (#1318)

Browse source 
* Adjust path for time stamped SNAPSHOT versions

Test the version string for the timestamp SNAPSHOT pattern. If it matches, substitute the SNAPSHOT version in the artifact path rather than the timestamped version string.

* Add changelog fragment for PR 713

* Update changelogs/fragments/713-maven-timestamp-snapshot.yml

Co-authored-by: Felix Fontein <felix@fontein.de>

* C
Fix problems reported by shippable
Fix problems reported by pull request checks

* Resolve additional shipping errors

Co-authored-by: jweber <jweber@seastreet.com>
Co-authored-by: Felix Fontein <felix@fontein.de>
(cherry picked from commit 9787e8a6bf)

Co-authored-by: John Weber <btsweber@gmail.com>
This commit is contained in:
patchback[bot] 2020-11-16 22:22:14 +01:00 committed by GitHub
parent 7e247b0eea
commit bdeb63e579
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelogs/fragments/713-maven-timestamp-snapshot.yml Normal file
View file

@ -0,0 +1,2 @@
bugfixes:
- "maven_artifact - handle timestamped snapshot version strings properly (https://github.com/ansible-collections/community.general/issues/709)."

7
plugins/modules/packaging/language/maven_artifact.py
View file

@ -215,6 +215,7 @@ import shutil
import io
import tempfile
import traceback
import re
from ansible.module_utils.ansible_release import __version__ as ansible_version
from re import match
@ -307,7 +308,11 @@ class Artifact(object):
def path(self, with_version=True):
base = posixpath.join(self.group_id.replace(".", "/"), self.artifact_id)
if with_version and self.version:
base = posixpath.join(base, self.version)
timestamp_version_match = re.match("^(.*-)?([0-9]{8}\\.[0-9]{6}-[0-9]+)$", self.version)
if timestamp_version_match:
base = posixpath.join(base, timestamp_version_match.group(1) + "SNAPSHOT")
else:
base = posixpath.join(base, self.version)
return base
def _generate_filename(self):