Skip to content

Commit db6a1da

Browse files
authored
Update bindep installation and operations (#140)
* Update bindep installation and execution * Increment collection to 1.7.4 * Update Ansible directories * Update ansible-builder installation logic Signed-off-by: Webster Mudge <[email protected]>
1 parent 30f38e1 commit db6a1da

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

.github/workflows/validate_pr.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,9 @@ jobs:
3838
- name: Set up Ansible collections
3939
run: |
4040
sudo update-alternatives --install /usr/bin/python python $(which python3) 1
41-
pip install ansible-core==2.12 ansible-builder pycodestyle voluptuous pylint pyyaml ansible-lint
41+
pip install --upgrade pip
42+
pip install ansible-core==2.12 ansible-builder bindep pycodestyle voluptuous pylint pyyaml ansible-lint
43+
mkdir -p /usr/share/ansible/collections /usr/share/ansible/roles
4244
ansible-galaxy collection install -r builder/requirements.yml -p /usr/share/ansible/collections
4345
ansible-galaxy role install -r builder/requirements.yml -p /usr/share/ansible/roles
4446
@@ -50,11 +52,9 @@ jobs:
5052
5153
- name: Set up Ansible collection dependencies
5254
run: |
53-
ansible-builder introspect \
54-
--write-pip final_python.txt --write-bindep final_bindep.txt \
55-
/usr/share/ansible/collections
56-
pip install -r final_python.txt
57-
sudo apt-get -y install $(cat final_bindep.txt)
55+
ansible-builder introspect --write-pip final_python.txt --write-bindep final_bindep.txt /usr/share/ansible/collections
56+
[[ -f final_python.txt ]] && pip install -r final_python.txt || echo "No Python dependencies found."
57+
[[ -f final_bindep.txt ]] && bindep --file final_bindep.txt || echo "No system dependencies found."
5858
5959
- name: Report installed Python dependencies
6060
run: pip freeze

galaxy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
namespace: cloudera
1818
name: exe
19-
version: 1.7.3
19+
version: 1.7.4
2020
readme: README.md
2121
authors:
2222
- Webster Mudge <[email protected]>

0 commit comments

Comments
 (0)