From bbc0c29c22d46062dd9a715ea3fa28ca2c8efe20 Mon Sep 17 00:00:00 2001 From: L3D Date: Sat, 15 Apr 2023 23:52:33 +0200 Subject: [PATCH 1/4] Update gitea role and improve docs --- README.md | 22 ++++++++++++++++++---- galaxy.yml | 2 +- roles/gitea | 2 +- 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 5c47743..c6a8807 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,15 @@ +[![collection l3d.git](https://ansible.l3d.space/svg/l3d.git_ansible-collection_collection.svg)](https://galaxy.ansible.com/l3d/git) +[![Maintainance](https://ansible.l3d.space/svg/l3d.git_maintainance_collection.svg)](https://ansible.l3d.space/#l3d.git) +[![License](https://ansible.l3d.space/svg/l3d.git_license_collection.svg)](LICENSE) + Ansible Collection - l3d.git ============================ -This is the Ansible Collection l3d.git. +This is the Ansible Collection ``l3d.git``. Here are all our ansible roles for installing git server. -## Roles in l3d.git -- [l3d.git.gitea](https://github.com/roles-ansible/ansible_role_gitea.git) - Ansible role to install gitea or forgejo git server +## Ansible Roles in l3d.git +- [![l3d.git.gitea](https://ansible.l3d.space/svg/l3d.git.gitea_ansible-role.svg)](https://github.com/roles-ansible/ansible_role_gitea.git) - Ansible role to install gitea or forgejo git server ## Using this Collection You can install the collection using ansible-galaxy by running: @@ -13,7 +17,17 @@ You can install the collection using ansible-galaxy by running: ansible-galaxy collection install l3d.git ``` -Or you could clone this collection in your local ansible project as ``collections/ansible_collections/l3d/git/``. +Or you could clone this collection in your local ansible project for example to ``collections/ansible_collections/l3d/git/``. Make sure you checkout [git submodules](https://git-scm.com/docs/git-submodule) too. Example: +``` +# Clone git Repo with submodules to specified path +git clone --recursive https://github.com/roles-ansible/ansible_collection_git.git collections/ansible_collections/l3d/git/ + +# change directory +cd collections/ansible_collections/l3d/git/ + +# optionally init git submodules +git submodule update --init --recursive +``` You can also list a collection in ``requirements.yml``: ```yaml diff --git a/galaxy.yml b/galaxy.yml index 3de010f..360d094 100644 --- a/galaxy.yml +++ b/galaxy.yml @@ -9,7 +9,7 @@ namespace: l3d name: git # The version of the collection. Must be compatible with semantic versioning -version: 1.0.0 +version: 1.0.1 # The path to the Markdown (.md) readme file. This path is relative to the root of the collection readme: README.md diff --git a/roles/gitea b/roles/gitea index 0daa72d..bcd4987 160000 --- a/roles/gitea +++ b/roles/gitea @@ -1 +1 @@ -Subproject commit 0daa72de78b4fa96e1c1cfcd0a70bff826ec61e7 +Subproject commit bcd4987a516c77cc9e919a6a6a9bf7ff3f9fa1aa From cef0ee6daf1556060eb0c883feab4e7969c8c999 Mon Sep 17 00:00:00 2001 From: L3D Date: Sat, 15 Apr 2023 23:59:24 +0200 Subject: [PATCH 2/4] Improve action --- .github/workflows/ansible-linting-check.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/ansible-linting-check.yml b/.github/workflows/ansible-linting-check.yml index 150e908..2c73469 100644 --- a/.github/workflows/ansible-linting-check.yml +++ b/.github/workflows/ansible-linting-check.yml @@ -16,6 +16,10 @@ jobs: steps: - name: 'checkout git repo' uses: actions/checkout@v3 + with: + lfs: true + submodules: true + fetch-depth: 0 - name: 'Lint Ansible Playbook' uses: ansible/ansible-lint-action@v6 From c151f7d230809bbeda4b69579c42e7fd50952d9a Mon Sep 17 00:00:00 2001 From: L3D Date: Sun, 16 Apr 2023 00:30:25 +0200 Subject: [PATCH 3/4] Update community.general as requirement --- README.md | 4 ++++ galaxy.yml | 3 ++- requirements.yml | 4 ++++ 3 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 requirements.yml diff --git a/README.md b/README.md index c6a8807..a879864 100644 --- a/README.md +++ b/README.md @@ -27,6 +27,9 @@ cd collections/ansible_collections/l3d/git/ # optionally init git submodules git submodule update --init --recursive + +# optionally install all requirements +ansible-galaxy install -r requirements.yml ``` You can also list a collection in ``requirements.yml``: @@ -34,6 +37,7 @@ You can also list a collection in ``requirements.yml``: --- collections: - name: l3d.git + version: ">=1.0.1" ``` ## Include roles in your playbook diff --git a/galaxy.yml b/galaxy.yml index 360d094..4468cc7 100644 --- a/galaxy.yml +++ b/galaxy.yml @@ -47,7 +47,8 @@ tags: # collection label 'namespace.name'. The value is a version range # L(specifiers,https://python-semanticversion.readthedocs.io/en/latest/#requirement-specification). Multiple version # range specifiers can be set and are separated by ',' -dependencies: {} +dependencies: + "community.general": ">=6.5.0" # The URL of the originating SCM repository repository: https://github.com/roles-ansible/ansible_collection_git.git diff --git a/requirements.yml b/requirements.yml new file mode 100644 index 0000000..704d4eb --- /dev/null +++ b/requirements.yml @@ -0,0 +1,4 @@ +--- +collections: + - name: community.general + version: ">=6.5.0" From b36454734470f2b63c49068d321df9f8f49e20a6 Mon Sep 17 00:00:00 2001 From: L3D Date: Sun, 16 Apr 2023 00:43:43 +0200 Subject: [PATCH 4/4] repair yamllint --- .github/workflows/ansible-linting-check.yml | 2 +- galaxy.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ansible-linting-check.yml b/.github/workflows/ansible-linting-check.yml index 2c73469..5ed3e8a 100644 --- a/.github/workflows/ansible-linting-check.yml +++ b/.github/workflows/ansible-linting-check.yml @@ -24,4 +24,4 @@ jobs: - name: 'Lint Ansible Playbook' uses: ansible/ansible-lint-action@v6 with: - targets: "." + path: "." diff --git a/galaxy.yml b/galaxy.yml index 4468cc7..b5e92a4 100644 --- a/galaxy.yml +++ b/galaxy.yml @@ -48,7 +48,7 @@ tags: # L(specifiers,https://python-semanticversion.readthedocs.io/en/latest/#requirement-specification). Multiple version # range specifiers can be set and are separated by ',' dependencies: - "community.general": ">=6.5.0" + "community.general": ">=6.5.0" # The URL of the originating SCM repository repository: https://github.com/roles-ansible/ansible_collection_git.git