Skip to content

Commit

Permalink
Update CI
Browse files Browse the repository at this point in the history
  • Loading branch information
flowerysong committed Dec 11, 2023
1 parent 1755fa9 commit 679aebc
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 13 deletions.
28 changes: 15 additions & 13 deletions .github/workflows/ansible-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ on:
env:
COLL_NS: flowerysong
COLL_NAME: melange
PYTHON_VERSION: 3.9
ANSIBLE_COLLECTIONS_PATHS: ${{ github.workspace }}

jobs:
Expand All @@ -17,23 +16,23 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out code
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Set up Python
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: ${{ env.PYTHON_VERSION }}
python-version: 3.12

- name: Install dependencies
run: |
python -m pip install --upgrade pip
python -m pip install 'git+https://github.com/ansible/ansible@stable-2.13#egg=ansible-core'
python -m pip install 'git+https://github.com/ansible/ansible@stable-2.16#egg=ansible-core'
- name: Build collection
run: ansible-galaxy collection build -vv

- name: Upload collection
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
path: ${{ env.COLL_NS }}-${{ env.COLL_NAME }}-*.tar.gz
name: ${{ env.COLL_NS }}-${{ env.COLL_NAME }}
Expand All @@ -44,26 +43,29 @@ jobs:
strategy:
matrix:
ansible_version:
- name: stable-2.12
version: git+https://github.com/ansible/[email protected]#egg=ansible-core
- name: stable-2.13
version: git+https://github.com/ansible/[email protected]#egg=ansible-core
- name: stable-2.15
version: git+https://github.com/ansible/[email protected]#egg=ansible-core
python: 3.9
- name: stable-2.16
version: git+https://github.com/ansible/[email protected]#egg=ansible-core
python: 3.12
- name: devel
version: git+https://github.com/ansible/ansible#egg=ansible-core
python: 3.12
runs-on: ubuntu-latest
steps:
- name: Set up Python
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: ${{ env.PYTHON_VERSION }}
python-version: ${{ matrix.ansible_version.python }}

- name: Install dependencies
run: |
python -m pip install --upgrade pip
python -m pip install '${{ matrix.ansible_version.version }}' pycodestyle pylint pyyaml voluptuous yamllint junit-xml
- name: Download collection
uses: actions/download-artifact@v2
uses: actions/download-artifact@v3
with:
name: ${{ env.COLL_NS }}-${{ env.COLL_NAME }}

Expand Down
1 change: 1 addition & 0 deletions plugins/filter/route53_unescape.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

DOCUMENTATION = '''
name: route53_unescape
description: Reverse octal escaping in Route53 resource names
short_description: Reverse octal escaping in Route53 resource names
version_added: "1.1.0"
author:
Expand Down
1 change: 1 addition & 0 deletions plugins/filter/sts_allow.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

DOCUMENTATION = '''
name: sts_allow
description: Produce an sts:AssumeRole statement for a principal
short_description: Produce an sts:AssumeRole statement for a principal
version_added: "1.1.0"
author:
Expand Down
2 changes: 2 additions & 0 deletions plugins/modules/s3_sync.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
- Added to local files when determining their keys.
type: str
required: false
default: ''
path:
description:
- Local directory path for synchronization.
Expand Down Expand Up @@ -116,6 +117,7 @@
- A dictionary containing metadata for the uploaded objects.
type: dict
required: false
default: {}
delete:
description:
- Remove objects that exist in the destination but are not present in the source.
Expand Down

0 comments on commit 679aebc

Please sign in to comment.