Skip to content

Commit

Permalink
Merge pull request #36 from Zialus/patch-1
Browse files Browse the repository at this point in the history
Fix download URL
  • Loading branch information
nmusatti authored Mar 28, 2021
2 parents 33e70fa + 606dc64 commit e29e733
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 7 deletions.
6 changes: 4 additions & 2 deletions .ansible-lint
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
---
skip_list:
# Skip the pipefail rule (306) due to controversy / there-be-dragons
# https://github.com/ansible/ansible-lint/issues/497
# https://github.com/ansible/ansible/issues/12903
- '306'
- '106'
- risky-shell-pipe
- role-name
- yaml
5 changes: 3 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
python-version: '3.x'

- name: Install test dependencies.
run: pip3 install yamllint ansible-lint
run: pip3 install yamllint ansible ansible-lint

- name: Lint code.
run: |
Expand All @@ -32,6 +32,7 @@ jobs:
name: Molecule
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
distro:
- centos8
Expand All @@ -57,7 +58,7 @@ jobs:
python-version: '3.x'

- name: Install test dependencies.
run: pip3 install molecule[docker,lint,test]
run: pip3 install ansible molecule[docker,lint,test]

- name: Run Molecule tests.
run: molecule test
Expand Down
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
.idea
.project
.pyproject
.pyproject
venv
.cache
4 changes: 2 additions & 2 deletions defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ python: "{{ ansible_python_interpreter | default( ansible_python.executable | de
pip: "{{ ( ansible_python.version_info[0] == 3 ) | ternary('pip3', 'pip') }}"
pip_proxy: ''

pip_download_url_current: https://bootstrap.pypa.io/get-pip.py
pip_download_url_py26: https://bootstrap.pypa.io/2.6/get-pip.py
pip_download_url_current: https://bootstrap.pypa.io/pip/3.5/get-pip.py
pip_download_url_py26: https://bootstrap.pypa.io/pip/2.6/get-pip.py
pip_download_url: "{{ ansible_python.version_info[:3]|join('.') is version_compare('2.7', '>=') | ternary( pip_download_url_current, pip_download_url_py26 ) }}"
4 changes: 4 additions & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
molecule[lint,docker,test]
ansible
ansible-lint
yamllint

0 comments on commit e29e733

Please sign in to comment.