Maintainance work (#22)

redhat-cop · Jun 13, 2024 · 92358c8 · 92358c8
1 parent dbfd6b8
commit 92358c8
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 46 deletions.
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -1,13 +1,12 @@
 ---
-name: Release
-
-on:   # yamllint disable-line rule:truthy
+name: "Release collection"
+on:  # yamllint disable-line rule:truthy
   release:
     types: [published]
 
 jobs:
-  release_automation_hub:
-    uses: ansible/devtools/.github/workflows/release_ah.yml@main
+  release:
+    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
@@ -1,5 +1,5 @@
 ---
-name: CI
+name: "CI"
 
 concurrency:
   group: ${{ github.head_ref || github.run_id }}
@@ -14,45 +14,27 @@ 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() }}
     needs:
       - changelog
+      - build-import
       - sanity
+      - ansible-lint
     runs-on: ubuntu-latest
     steps:
       - run: >-
           python -c "assert 'failure' not in
           set([
           '${{ needs.changelog.result }}',
           '${{ needs.sanity.result }}',
+          '${{ needs.ansible-lint.result }}'
           ])"