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

Update galaxy cli metadata file templates (#51398)

Browse source 
* Remove github_branch from galaxy meta file templates

Signed-off-by: Andrew Crosby <acrosby@redhat.com>

* Update galaxy meta license examples to valid SPDX IDs

Signed-off-by: Andrew Crosby <acrosby@redhat.com>
This commit is contained in:
Andrew Crosby 2019-02-22 00:54:02 -05:00 committed by ansibot
parent d2297c50d2
commit bc2bbff6bc
5 changed files with 25 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/ansible/cli/galaxy.py
View file

@ -210,7 +210,7 @@ class GalaxyCLI(CLI):
author='your name', author='your name',
description='your description', description='your description',
company='your company (optional)', company='your company (optional)',
license='license (GPLv2, CC-BY, etc)', license='license (GPL-2.0-or-later, MIT, etc)',
issue_tracker_url='http://example.com/issue/tracker', issue_tracker_url='http://example.com/issue/tracker',
min_ansible_version='2.4', min_ansible_version='2.4',
role_type=context.CLIARGS['role_type'] role_type=context.CLIARGS['role_type']

20
lib/ansible/galaxy/data/apb/meta/main.yml.j2
View file

@ -7,23 +7,15 @@ galaxy_info:
# next line and provide a value # next line and provide a value
# issue_tracker_url: {{ issue_tracker_url }} # issue_tracker_url: {{ issue_tracker_url }}
# Some suggested licenses: # Choose a valid license ID from https://spdx.org - some suggested licenses:
# - BSD (default) # - BSD-3-Clause (default)
# - MIT # - MIT
# - GPLv2 # - GPL-2.0-or-later
# - GPLv3 # - GPL-3.0-only
# - Apache # - Apache-2.0
# - CC-BY # - CC-BY-4.0
license: {{ license }} license: {{ license }}
# Optionally specify the branch Galaxy will use when accessing the GitHub
# repo for this role. During role install, if no tags are available,
# Galaxy will use this branch. During import Galaxy will access files on
# this branch. If Travis integration is configured, only notifications for this
# branch will be accepted. Otherwise, in all cases, the repo's default branch
# (usually master) will be used.
#github_branch:
# #
# platforms is a list of platforms, and each platform has a name and a list of versions. # platforms is a list of platforms, and each platform has a name and a list of versions.
# #

20
lib/ansible/galaxy/data/container/meta/main.yml.j2
View file

@ -7,13 +7,13 @@ galaxy_info:
# next line and provide a value # next line and provide a value
# issue_tracker_url: {{ issue_tracker_url }} # issue_tracker_url: {{ issue_tracker_url }}
# Some suggested licenses: # Choose a valid license ID from https://spdx.org - some suggested licenses:
# - BSD (default) # - BSD-3-Clause (default)
# - MIT # - MIT
# - GPLv2 # - GPL-2.0-or-later
# - GPLv3 # - GPL-3.0-only
# - Apache # - Apache-2.0
# - CC-BY # - CC-BY-4.0
license: {{ license }} license: {{ license }}
min_ansible_container_version: 0.2.0 min_ansible_container_version: 0.2.0
@ -21,14 +21,6 @@ galaxy_info:
# If Ansible is required outside of the build container, provide the minimum version: # If Ansible is required outside of the build container, provide the minimum version:
# min_ansible_version: # min_ansible_version:
# Optionally specify the branch Galaxy will use when accessing the GitHub
# repo for this role. During role install, if no tags are available,
# Galaxy will use this branch. During import Galaxy will access files on
# this branch. If Travis integration is configured, only notifications for this
# branch will be accepted. Otherwise, in all cases, the repo's default branch
# (usually master) will be used.
#github_branch:
# #
# Provide a list of supported platforms, and for each platform a list of versions. # Provide a list of supported platforms, and for each platform a list of versions.
# If you don't wish to enumerate all versions for a particular platform, use 'all'. # If you don't wish to enumerate all versions for a particular platform, use 'all'.

20
lib/ansible/galaxy/data/default/meta/main.yml.j2
View file

@ -7,13 +7,13 @@ galaxy_info:
# next line and provide a value # next line and provide a value
# issue_tracker_url: {{ issue_tracker_url }} # issue_tracker_url: {{ issue_tracker_url }}
# Some suggested licenses: # Choose a valid license ID from https://spdx.org - some suggested licenses:
# - BSD (default) # - BSD-3-Clause (default)
# - MIT # - MIT
# - GPLv2 # - GPL-2.0-or-later
# - GPLv3 # - GPL-3.0-only
# - Apache # - Apache-2.0
# - CC-BY # - CC-BY-4.0
license: {{ license }} license: {{ license }}
min_ansible_version: {{ min_ansible_version }} min_ansible_version: {{ min_ansible_version }}
@ -21,14 +21,6 @@ galaxy_info:
# If this a Container Enabled role, provide the minimum Ansible Container version. # If this a Container Enabled role, provide the minimum Ansible Container version.
# min_ansible_container_version: # min_ansible_container_version:
# Optionally specify the branch Galaxy will use when accessing the GitHub
# repo for this role. During role install, if no tags are available,
# Galaxy will use this branch. During import Galaxy will access files on
# this branch. If Travis integration is configured, only notifications for this
# branch will be accepted. Otherwise, in all cases, the repo's default branch
# (usually master) will be used.
#github_branch:
# #
# Provide a list of supported platforms, and for each platform a list of versions. # Provide a list of supported platforms, and for each platform a list of versions.
# If you don't wish to enumerate all versions for a particular platform, use 'all'. # If you don't wish to enumerate all versions for a particular platform, use 'all'.

20
lib/ansible/galaxy/data/network/meta/main.yml.j2
View file

@ -7,13 +7,13 @@ galaxy_info:
# next line and provide a value # next line and provide a value
# issue_tracker_url: {{ issue_tracker_url }} # issue_tracker_url: {{ issue_tracker_url }}
# Some suggested licenses: # Choose a valid license ID from https://spdx.org - some suggested licenses:
# - BSD (default) # - BSD-3-Clause (default)
# - MIT # - MIT
# - GPLv2 # - GPL-2.0-or-later
# - GPLv3 # - GPL-3.0-only
# - Apache # - Apache-2.0
# - CC-BY # - CC-BY-4.0
license: {{ license }} license: {{ license }}
min_ansible_version: {{ min_ansible_version }} min_ansible_version: {{ min_ansible_version }}
@ -21,14 +21,6 @@ galaxy_info:
# If this a Container Enabled role, provide the minimum Ansible Container version. # If this a Container Enabled role, provide the minimum Ansible Container version.
# min_ansible_container_version: # min_ansible_container_version:
# Optionally specify the branch Galaxy will use when accessing the GitHub
# repo for this role. During role install, if no tags are available,
# Galaxy will use this branch. During import Galaxy will access files on
# this branch. If Travis integration is configured, only notifications for this
# branch will be accepted. Otherwise, in all cases, the repo's default branch
# (usually master) will be used.
#github_branch:
# #
# platforms is a list of platforms, and each platform has a name and a list of versions. # platforms is a list of platforms, and each platform has a name and a list of versions.
# #