Skip to content

Commit

Permalink
Merge pull request #43 from nmusatti/master
Browse files Browse the repository at this point in the history
Attempt to fix CI breakage
  • Loading branch information
nmusatti authored Aug 14, 2022
2 parents a4fc274 + 759a61b commit 7e2eff3
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 4 deletions.
1 change: 1 addition & 0 deletions .ansible-lint
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@ skip_list:
- risky-shell-pipe
- role-name
- yaml
- fqcn-builtins
2 changes: 1 addition & 1 deletion .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<4.10 ansible-lint<5.3.2
run: pip3 install yamllint ansible ansible-lint

- name: Lint code.
run: |
Expand Down
4 changes: 2 additions & 2 deletions defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ python: "{{ ansible_python_interpreter | default( ansible_python.executable | de
pip: "{{ ( ansible_python.version_info[0] == 3 ) | ternary('pip3', 'pip') }}"
pip_proxy: ''

python_version: "{{ ansible_python.version_info[:3]|join('.') }}"
python_minor: "{{ ansible_python.version_info[:2]|join('.') }}"
python_version: "{{ ansible_python.version_info[:3] | join('.') }}"
python_minor: "{{ ansible_python.version_info[:2] | join('.') }}"
pip_download_version: "{{ ( python_version is version_compare('3.0', '<') ) | ternary( python_minor, '3.5') }}"
pip_download_url: "https://bootstrap.pypa.io/pip/{{ pip_download_version }}/get-pip.py"
pip_max_version2: "{{ ( python_minor == '2.6' ) | ternary( '10', '21' ) }}"
Expand Down
2 changes: 1 addition & 1 deletion meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ galaxy_info:
author: bobbyrenwick
description: An ansible role that ensures pip is installed at the version you specify.
license: WTFPL
min_ansible_version: 1.9
min_ansible_version: "1.9"

platforms:
- name: EL
Expand Down

0 comments on commit 7e2eff3

Please sign in to comment.