Skip to content

Commit

Permalink
Merge branch 'main' into add_vars_to_user_template_and_user
Browse files Browse the repository at this point in the history
  • Loading branch information
rndmh3ro authored Oct 28, 2024
2 parents e1c34d9 + 41f56d0 commit 916f521
Show file tree
Hide file tree
Showing 5 changed files with 35 additions and 12 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
with:
# We must fetch at least the immediate parents so that if this is
# a pull request then we can checkout the head.
Expand All @@ -45,7 +45,7 @@ jobs:

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@294a9d92911152fe08befb9ec03e240add280cb3 # v3
uses: github/codeql-action/init@662472033e021d55d94146f66f6058822b0b39fd # v3
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
Expand All @@ -56,7 +56,7 @@ jobs:
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@294a9d92911152fe08befb9ec03e240add280cb3 # v3
uses: github/codeql-action/autobuild@662472033e021d55d94146f66f6058822b0b39fd # v3

# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl
Expand All @@ -70,4 +70,4 @@ jobs:
# make release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@294a9d92911152fe08befb9ec03e240add280cb3 # v3
uses: github/codeql-action/analyze@662472033e021d55d94146f66f6058822b0b39fd # v3
20 changes: 20 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -183,3 +183,23 @@ jobs:
# which should improve CI performance. See limitations on
# https://github.com/ansible-community/ansible-test-gh-action#pull-request-change-detection
pull-request-change-detection: true
docsite:
name: Lint extra docsite docs and links
permissions:
contents: read
runs-on: ubuntu-latest
steps:
- name: Check out code
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4

- name: Set up Python
uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5
with:
python-version: 3.11

- name: Install antsibull-docs
run: pip install antsibull-docs --disable-pip-version-check

- name: Run collection docs linter
run: antsibull-docs lint-collection-docs --plugin-docs --validate-collection-refs all --disallow-unknown-collection-refs --skip-rstcheck .
12 changes: 6 additions & 6 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
runs-on: ubuntu-latest
name: create documentation inside docs-folder
steps:
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
fetch-depth: 0
persist-credentials: false
Expand All @@ -26,13 +26,13 @@ jobs:
# the form ./ansible_collections/${{env.NAMESPACE}}/${{env.COLLECTION_NAME}}/

- name: Check out code to ansible collection location
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
path: ansible_collections/${{env.NAMESPACE}}/${{env.COLLECTION_NAME}}
fetch-depth: 0

- name: Set up Python
uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5
uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5
with:
python-version: 3.8

Expand Down Expand Up @@ -68,7 +68,7 @@ jobs:
name: create release draft
needs: update_docs # the documentation should be updated before creating a new release
steps:
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
# checkout the main branch, because without the ref, the above commit ("update documentation")
# isn't included and the push will fail
Expand All @@ -77,7 +77,7 @@ jobs:
persist-credentials: false

- name: Set up Python
uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5
uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5
with:
python-version: 3.8

Expand Down Expand Up @@ -135,7 +135,7 @@ jobs:

# do a second checkout to prevent race situation
# changelog gets updated but action works on old commit id
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
ref: main

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/roles-readme.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out code
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4

- name: Set up Python
uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5
uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5
with:
python-version: 3.11

Expand Down
3 changes: 3 additions & 0 deletions changelogs/changelog.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ releases:
2.1.3:
changes:
trivial:
- 'chore(deps): update github/codeql-action digest to 6624720 (https://github.com/telekom-mms/ansible-collection-icinga-director/pull/264)'
- 'chore(deps): update actions/checkout action to v4.2.0 (https://github.com/telekom-mms/ansible-collection-icinga-director/pull/263)'
- 'feat(test): add antsibull-doc tests (https://github.com/telekom-mms/ansible-collection-icinga-director/pull/261)'
- Fix typo in argument_specs.yml (https://github.com/telekom-mms/ansible-collection-icinga-director/pull/260)
- 'fix(service): fix var before assignment (https://github.com/telekom-mms/ansible-collection-icinga-director/pull/258)'
- 'chore(deps): update github/codeql-action digest to 883d858 (https://github.com/telekom-mms/ansible-collection-icinga-director/pull/257)'
Expand Down

0 comments on commit 916f521

Please sign in to comment.