Merge branch 'geerlingguy:master' into master

This commit is contained in:
Or Bin 2022-01-15 14:47:33 +02:00 committed by GitHub
commit 138aa4bd9c
3 changed files with 6 additions and 4 deletions

View File

@ -41,7 +41,7 @@ jobs:
strategy: strategy:
matrix: matrix:
distro: distro:
- centos8 - rockylinux8
- centos7 - centos7
- ubuntu2004 - ubuntu2004
- ubuntu1804 - ubuntu1804

View File

@ -32,7 +32,9 @@ jobs:
python-version: '3.x' python-version: '3.x'
- name: Install Ansible. - name: Install Ansible.
run: pip3 install ansible-base run: pip3 install ansible-core
- name: Trigger a new import on Galaxy. - name: Trigger a new import on Galaxy.
run: ansible-galaxy role import --api-key ${{ secrets.GALAXY_API_KEY }} $(echo ${{ github.repository }} | cut -d/ -f1) $(echo ${{ github.repository }} | cut -d/ -f2) run: >-
ansible-galaxy role import --api-key ${{ secrets.GALAXY_API_KEY }}
$(echo ${{ github.repository }} | cut -d/ -f1) $(echo ${{ github.repository }} | cut -d/ -f2)

View File

@ -2,7 +2,7 @@
- name: Check current docker-compose version. - name: Check current docker-compose version.
command: "{{ docker_compose_path }} --version" command: "{{ docker_compose_path }} --version"
register: docker_compose_current_version register: docker_compose_current_version
check_mode: no check_mode: false
changed_when: false changed_when: false
failed_when: false failed_when: false