Skip to content

Commit

Permalink
Merge pull request #22 from roles-ansible/lint
Browse files Browse the repository at this point in the history
Update Actions and improve linting
  • Loading branch information
DO1JLR authored Oct 22, 2023
2 parents ab828d4 + 91ad2e6 commit a6417f8
Show file tree
Hide file tree
Showing 7 changed files with 57 additions and 35 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/ansible-linting-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,10 @@ jobs:
- name: 'checkout git repo'
uses: actions/checkout@v4
with:
lfs: true
submodules: true
fetch-depth: 0

- name: Run ansible-lint
uses: ansible-actions/ansible-lint-action@v0.0.3
uses: ansible-actions/ansible-lint-action@v1.0.1
with:
target: "./"
18 changes: 10 additions & 8 deletions .github/workflows/galaxy.yml
Original file line number Diff line number Diff line change
@@ -1,22 +1,24 @@
---
name: Galaxy release
name: Galaxy-NG Roles Import

# yamllint disable-line rule:truthy
on:
push:
branches: ['main']
release:
types: ['created']

jobs:
build:
name: Jinja2 Linting
runs-on: ubuntu-latest

steps:
- name: 'checkout git repo'
- name: 'Checkout git repo'
uses: actions/checkout@v4
with:
submodules: true
fetch-depth: 0

- name: 'release on galaxy'
uses: robertdebock/galaxy-action@1.2.1
- name: 'Release on galaxy'
uses: ansible-actions/ansible-galaxy-action@v1.0.0
with:
galaxy_api_key: ${{ secrets.galaxy_api_key }}
git_branch: 'main'
galaxy_api_key: ${{ secrets.galaxy_api_key }
22 changes: 22 additions & 0 deletions .github/workflows/j2lint-check.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
---
name: Jinja2 Linting check

# yamllint disable-line rule:truthy
on: [push, pull_request]

jobs:
build:
name: Jinja2 Linting
runs-on: ubuntu-latest

steps:
- name: 'checkout git repo'
uses: actions/checkout@v4
with:
submodules: true
fetch-depth: 0

- name: Run j2lint
uses: ansible-actions/[email protected]
with:
target: "./"
22 changes: 22 additions & 0 deletions .github/workflows/yamllint-check.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
---
name: Yamllint check

# yamllint disable-line rule:truthy
on: [push, pull_request]

jobs:
build:
name: Yamllint
runs-on: ubuntu-latest

steps:
- name: 'checkout git repo'
uses: actions/checkout@v4
with:
submodules: true
fetch-depth: 0

- name: Run yamllint
uses: ansible-actions/[email protected]
with:
target: "./"
23 changes: 0 additions & 23 deletions .github/workflows/yamllint.yaml

This file was deleted.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[![Ansible Galaxy](https://ansible.l3d.space/svg/l3d.etebase.svg)](https://galaxy.ansible.com/ui/standalone/roles/roles-ansible/etebase/)
[![Ansible Galaxy](https://ansible.l3d.space/svg/l3d.etebase.svg)](https://galaxy.ansible.com/ui/standalone/roles/l3d/etebase/)
[![MIT License](https://ansible.l3d.space/svg/l3d.etebase_license.svg)](LICENSE)
[![Maintainance](https://ansible.l3d.space/svg/l3d.etebase_maintainance.svg)](https://ansible.l3d.space/#l3d.etebase)

Expand Down
2 changes: 1 addition & 1 deletion templates/etebase-server.ini.j2
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

[global]
secret_file = {{ etebase__global_secret_file }}
debug = {{ etebase__global_debug | ternary('true', 'false') }}
debug = {{ etebase__global_debug | ternary('true', 'false') }}
;Set the paths where data will be stored at
static_root = {{ etebase__global_static_root }}
media_root = {{ etebase__global_media_root }}
Expand Down

0 comments on commit a6417f8

Please sign in to comment.