From 1d677b158e52af61bf1b2fb93b05afd7df6e8ec8 Mon Sep 17 00:00:00 2001 From: rohitthakur2590 Date: Mon, 27 Nov 2023 12:54:13 +0530 Subject: [PATCH] fix wf Signed-off-by: rohitthakur2590 --- .github/workflows/lint.yml | 12 ------------ .github/workflows/tests.yml | 10 +++++++--- 2 files changed, 7 insertions(+), 15 deletions(-) delete mode 100644 .github/workflows/lint.yml diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml deleted file mode 100644 index 853e4b6..0000000 --- a/.github/workflows/lint.yml +++ /dev/null @@ -1,12 +0,0 @@ ---- -name: ansible-lint -on: # yamllint disable-line rule:truthy - pull_request: - branches: ["main"] -jobs: - build: - name: Ansible Lint - runs-on: ubuntu-latest - steps: - - name: Run ansible-lint - uses: ansible/ansible-lint@main diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 0fb4cc0..0f8c897 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -1,5 +1,5 @@ --- -name: test_collection +name: CI concurrency: group: ${{ github.head_ref || github.run_id }} @@ -14,9 +14,11 @@ on: # yamllint disable-line rule:truthy jobs: + ansible-lint: + uses: ansible-network/github_actions/.github/workflows/ansible-lint.yml@main changelog: uses: ansible-network/github_actions/.github/workflows/changelog.yml@main - if: github.event_name != 'schedule' + if: github.event_name != 'pull_request' sanity: uses: ansible-network/github_actions/.github/workflows/sanity.yml@main unit-galaxy: @@ -28,8 +30,9 @@ jobs: git+https://github.com/ansible-collections/ansible.utils.git git+https://github.com/ansible-collections/ansible.netcommon.git all_green: - if: ${{ always() && (github.event_name != 'schedule') }} + if: ${{ always() }} needs: + - ansible-lint - changelog - sanity - unit-galaxy @@ -39,6 +42,7 @@ jobs: - run: >- python -c "assert 'failure' not in set([ + '${{ needs.ansible-lint.result }}', '${{ needs.changelog.result }}', '${{ needs.sanity.result }}', '${{ needs.unit-galaxy.result }}',