From ed52ecfda38661823e56f764f235d0dda4c8d994 Mon Sep 17 00:00:00 2001 From: L3D Date: Sat, 28 Oct 2023 17:30:10 +0200 Subject: [PATCH] Adding requirement --- .github/workflows/ansible-linting-check.yml | 8 +++---- .github/workflows/galaxy.yml | 16 +++++++------- .github/workflows/j2lint-check.yml | 22 ++++++++++++++++++++ .github/workflows/yamllint-check.yml | 22 ++++++++++++++++++++ .github/workflows/yamllint.yaml | 23 --------------------- 5 files changed, 57 insertions(+), 34 deletions(-) create mode 100644 .github/workflows/j2lint-check.yml create mode 100644 .github/workflows/yamllint-check.yml delete mode 100644 .github/workflows/yamllint.yaml diff --git a/.github/workflows/ansible-linting-check.yml b/.github/workflows/ansible-linting-check.yml index b7357a7..e304fa0 100644 --- a/.github/workflows/ansible-linting-check.yml +++ b/.github/workflows/ansible-linting-check.yml @@ -10,14 +10,14 @@ jobs: runs-on: ubuntu-latest steps: - - name: 'checkout git repo' - uses: actions/checkout@v4.1.0 + - name: Checkout git repo + uses: actions/checkout@v4 with: - lfs: true - submodules: false + submodules: true fetch-depth: 0 - name: Run ansible-lint uses: ansible-actions/ansible-lint-action@v1.0.2 with: target: "./" + collections_yml: 'requirements.yml' diff --git a/.github/workflows/galaxy.yml b/.github/workflows/galaxy.yml index 4426496..b44f94e 100644 --- a/.github/workflows/galaxy.yml +++ b/.github/workflows/galaxy.yml @@ -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: Galaxy Role Importer 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.1.1 with: galaxy_api_key: ${{ secrets.galaxy_api_key }} - git_branch: 'main' diff --git a/.github/workflows/j2lint-check.yml b/.github/workflows/j2lint-check.yml new file mode 100644 index 0000000..00c7861 --- /dev/null +++ b/.github/workflows/j2lint-check.yml @@ -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/j2lint-action@v0.0.1 + with: + target: "./" diff --git a/.github/workflows/yamllint-check.yml b/.github/workflows/yamllint-check.yml new file mode 100644 index 0000000..5e62f57 --- /dev/null +++ b/.github/workflows/yamllint-check.yml @@ -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/yamllint-action@v0.0.1 + with: + target: "./" diff --git a/.github/workflows/yamllint.yaml b/.github/workflows/yamllint.yaml deleted file mode 100644 index 99bb4c4..0000000 --- a/.github/workflows/yamllint.yaml +++ /dev/null @@ -1,23 +0,0 @@ ---- -name: 'Yamllint GitHub Actions' - -# yamllint disable-line rule:truthy -on: - push: - branches: '*' - pull_request: - branches: '*' - -jobs: - yamllint: - name: 'Yamllint' - runs-on: ubuntu-latest - steps: - - name: 'checkout git repo' - uses: actions/checkout@v4 - - - name: 'Yamllint' - uses: karancode/yamllint-github-action@v2.1.1 - with: - yamllint_file_or_dir: '.' - yamllint_config_filepath: './.yamllint'