From 526b47ee468dba8ad2be89c890a3ead10b5fdafc Mon Sep 17 00:00:00 2001 From: Vinay M <63404819+roverflow@users.noreply.github.com> Date: Thu, 13 Jun 2024 16:41:21 +0530 Subject: [PATCH] maintainance work (#30) --- .github/workflows/lint.yml | 13 ----------- .github/workflows/release.yml | 4 ++-- .github/workflows/tests.yml | 41 ++++++++++------------------------- 3 files changed, 14 insertions(+), 44 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 fbac38c..0000000 --- a/.github/workflows/lint.yml +++ /dev/null @@ -1,13 +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: - - uses: actions/checkout@v4 - - name: Run ansible-lint - uses: ansible/ansible-lint@main diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index fb0e16c..d0ca114 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,13 +1,13 @@ --- name: Release -on: # yamllint disable-line rule:truthy +on: # yamllint disable-line rule:truthy release: types: [published] jobs: release_automation_hub: - uses: ansible/devtools/.github/workflows/release_ah.yml@main + uses: ansible/ansible-content-actions/.github/workflows/release_ah.yaml@main with: environment: ah secrets: diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 31730bb..68d352d 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -1,5 +1,5 @@ --- -name: CI +name: "CI" concurrency: group: ${{ github.head_ref || github.run_id }} @@ -14,40 +14,21 @@ on: # yamllint disable-line rule:truthy jobs: changelog: - uses: ansible-network/github_actions/.github/workflows/changelog.yml@main + uses: ansible/ansible-content-actions/.github/workflows/changelog.yaml@main if: github.event_name == 'pull_request' + build-import: + uses: ansible/ansible-content-actions/.github/workflows/build_import.yaml@main + ansible-lint: + uses: ansible/ansible-content-actions/.github/workflows/ansible_lint.yaml@main sanity: - uses: ansible-network/github_actions/.github/workflows/sanity.yml@main - with: - matrix_include: "[]" - matrix_exclude: >- - [ - { - "ansible-version": "stable-2.14", - "python-version": "3.12" - }, - { - "ansible-version": "stable-2.15", - "python-version": "3.12" - }, - { - "ansible-version": "stable-2.16", - "python-version": "3.9" - }, - { - "ansible-version": "milestone", - "python-version": "3.9" - }, - { - "ansible-version": "devel", - "python-version": "3.9" - }, - ] + uses: ansible/ansible-content-actions/.github/workflows/sanity.yaml@main all_green: - if: ${{ always() }} + if: ${{ always() && (github.event_name != 'schedule') }} needs: - changelog - sanity + - ansible-lint + - build-import runs-on: ubuntu-latest steps: - run: >- @@ -55,4 +36,6 @@ jobs: set([ '${{ needs.changelog.result }}', '${{ needs.sanity.result }}', + '${{ needs.ansible-lint.result }}' + '${{ needs.build-import.result }}' ])"