Merge pull request #172 from opsmill/develop

Pre-release 1.4.0

Author: BeArchiTek

.ansible-lint

@@ -1,4 +1,17 @@
 ---
+profile: production
+
 exclude_paths:
-    - .github/
-    - changelogs/changelog.yaml
+  - .cache/ # implicit unless exclude_paths is defined in config
+  - .venv/
+  - .github/
+  - tests/
+  - docs/node_modules/
+
+skip_list:
+  - args[module]
+  - no-handler
+  - yaml[key-duplicates]
+  - yaml[line-length]
+
+offline: false

.github/workflows/trigger-pr-develop.yml

@@ -14,6 +14,5 @@ jobs:
   linter:
     uses: ./.github/workflows/workflow-linter.yml
 
-  tests:
-    needs: ["linter"]
-    uses: ./.github/workflows/workflow-tests.yml
+  ansible_linter_and_tests:
+    uses: ./.github/workflows/workflow-ansible-linter-and-tests.yml

.github/workflows/trigger-pr-stable.yml

@@ -11,6 +11,5 @@ jobs:
   linter:
     uses: ./.github/workflows/workflow-linter.yml
 
-  tests:
-    needs: ["linter"]
-    uses: ./.github/workflows/workflow-tests.yml
+  ansible_linter_and_tests:
+    uses: ./.github/workflows/workflow-ansible-linter-and-tests.yml

.github/workflows/trigger-push-docs-stable.yml

@@ -0,0 +1,16 @@
+---
+# yamllint disable rule:truthy
+name: "Push Docs on stable"
+
+on:
+  push:
+    branches:
+      - stable
+    paths:
+      - 'docs/docs/**'
+      - 'docs/sidebars.ts'
+
+jobs:
+  sync_docs:
+    uses: ./.github/workflows/workflow-sync-docs.yml
+    secrets: inherit

.github/workflows/trigger-push-stable.yml

@@ -8,8 +8,6 @@ on:
       - stable
     paths-ignore:
       - 'docs/**'
-      - 'CHANGELOG.rst'
-      - 'changelogs/**'
 
 jobs:
   check_commit:

.github/workflows/workflow-ansible-linter-and-tests.yml

@@ -0,0 +1,57 @@
+---
+# yamllint disable rule:truthy
+name: "Run Sanity, Unit & Integration Tests"
+on:
+  workflow_call:
+    inputs:
+      runs-on:
+        description: "The OS to run the job on"
+        required: false
+        default: "ubuntu-22.04"
+        type: string
+
+  workflow_dispatch:
+    inputs:
+      runs-on:
+        description: "The OS to run the job on"
+        required: false
+        default: "ubuntu-22.04"
+        type: string
+
+  schedule:
+    - cron: '0 0 * * *'
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}-ansible
+  cancel-in-progress: true
+
+jobs:
+  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/ansible-content-actions/.github/workflows/sanity.yaml@main
+  # unit-galaxy:
+  #   uses: ansible/ansible-content-actions/.github/workflows/unit.yaml@main
+  # unit-source:
+  #   uses: ansible-network/github_actions/.github/workflows/unit_source.yml@main
+  #   with:
+  #     collection_pre_install: >-
+  #       git+https://github.com/ansible-collections/ansible.utils.git
+
+  all_green:
+    if: ${{ always() }}
+    needs:
+      - sanity
+      - ansible-lint
+      # - unit-galaxy
+      # - unit-source
+    runs-on: ubuntu-22.04
+    steps:
+      - run: >-
+          python -c "assert 'failure' not in
+          set([
+          '${{ needs.sanity.result }}',
+          '${{ needs.ansible-lint.result }}'
+          ])"

.github/workflows/workflow-changelog-and-docs.yml

@@ -1,6 +1,6 @@
 ---
 # yamllint disable rule:truthy
-name: "Update Changelog & Documentation"
+name: "Update Documentation"
 
 on:
   workflow_call:
@@ -10,9 +10,9 @@ on:
         type: string
 
 jobs:
-  generate_changelog:
+  generate_docs:
     runs-on: "ubuntu-22.04"
-    name: "Create Changelog and Docs"
+    name: "Create Docs"
     steps:
       - uses: actions/checkout@v4
         with:
@@ -24,33 +24,26 @@ jobs:
         with:
           python-version: "3.11"
 
-      - name: Install antsibull-changelog, antsichaut
-        run: python -m pip install toml invoke --disable-pip-version-check
+      - name: "Install Poetry"
+        uses: "snok/install-poetry@v1"
+        with:
+          version: 1.8.5
+          virtualenvs-create: true
+          virtualenvs-in-project: true
+          installer-parallel: true
+
+      - name: Install dependencies
+        run: poetry install --with dev
 
       - name: "Generate Docs"
         run: "invoke generate-doc"
 
-      - name: Sync folders
-        run: |
-          rm -rf target-repo/docs/docs-ansible/*
-          rm -f target-repo/docs/sidebars-ansible.ts
-          cp -r source-repo/docs/docs/* target-repo/docs/docs-ansible/
-          cp source-repo/docs/sidebars.ts target-repo/docs/sidebars-ansible.ts
-          cd target-repo
-          git config user.name github-actions
-          git config user.email [email protected]
-          git add .
-          if ! (git diff --quiet && git diff --staged --quiet); then
-            git commit -m "Sync docs from infrahub-ansible repo"
-            git push
-          fi
-
-      - name: commit changelog and docs
+      - name: commit docs
         uses: github-actions-x/[email protected]
         with:
           github-token: ${{ secrets.GH_INFRAHUB_BOT_TOKEN }}
           push-branch: 'stable'
-          commit-message: 'chore: update changelog & docs'
+          commit-message: 'chore: update docs'
           files: docs/
           name: opsmill-bot
           email: [email protected]

.github/workflows/workflow-linter.yml

@@ -11,7 +11,7 @@ on:
         type: string
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
+  group: ${{ github.workflow }}-${{ github.ref }}-linter
   cancel-in-progress: true
 
 env:
@@ -45,14 +45,6 @@ jobs:
     steps:
       - name: "Check out repository code"
         uses: "actions/checkout@v4"
-      - name: "Identify which files have changed"
-        uses: dorny/paths-filter@v3
-        id: changes
-        with:
-          filters: |
-            src:
-              - '**.yml'
-              - '**.yaml'
       - name: "Setup environment"
         run: "pip install yamllint==${{ env.YAMLLINT_VERSION }}"
       - name: "Linting: yamllint"
@@ -96,23 +88,12 @@ jobs:
       - name: "Linting: ruff format"
         run: "poetry run ruff format --check --diff ."
 
-  ansible-lint:
-    name: ansible-lint
-    runs-on: "ubuntu-22.04"
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Run ansible-lint
-        uses: ansible/ansible-lint-action@v6
-
   documentation-lint:
     defaults:
       run:
         working-directory: ./docs
     if: needs.files-changed.outputs.documentation == 'true'
-    needs: ["files-changed", "yaml-lint", "python-lint"]
+    needs: ["files-changed", "python-lint"]
     runs-on: "ubuntu-22.04"
     timeout-minutes: 5
     steps:
@@ -134,7 +115,7 @@ jobs:
         run: "invoke docusaurus"
 
   validate-documentation-style:
-    needs: ["files-changed", "yaml-lint", "python-lint"]
+    needs: ["files-changed", "python-lint"]
     runs-on: "ubuntu-22.04"
     timeout-minutes: 5
     steps:

.github/workflows/sync-docs.yml renamed to .github/workflows/workflow-sync-docs.yml

@@ -2,12 +2,11 @@
 # yamllint disable rule:truthy rule:truthy rule:line-length
 name: Sync Docs Folders
 on:
-  push:
-    branches:
-      - stable
-    paths:
-      - 'docs/docs/**'
-      - 'docs/sidebars.ts'
+  workflow_call:
+    inputs:
+      version:
+        required: true
+        type: string
 
 jobs:
   sync:

.github/workflows/workflow-tests.yml

@@ -1,13 +1,13 @@
 ---
 extends: default
 
-ignore: |
-  /.venv
-  /examples
-  /tests/**
+ignore:
+  - .venv
+  - examples
+  - tests/**
+  - docs/node_modules/**
 
 rules:
-  new-lines: disable
   comments-indentation: disable
   comments:
     # Changed this to stop a mess between linters from Prettier (vscode) to yamllint