Skip to content

Commit 32fa36c

Browse files
committed
Merge remote-tracking branch 'origin/release/v3.4.2' into devel
2 parents a610899 + 6f1a646 commit 32fa36c

File tree

3 files changed

+8
-12
lines changed

3 files changed

+8
-12
lines changed

.github/workflows/validate_pr.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,12 @@ jobs:
3535
python-version: '3.9'
3636
cache: 'pip'
3737

38-
- name: Set up Ansible collections
38+
- name: Set up Ansible and Ansible collections and roles
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

bindep.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,3 @@
1414

1515
# ansible.posix.patch
1616
patch [platform:rpm]
17-
18-
# community.general.ipa_user
19-
hashlib [platform:rpm]
20-
base64 [platform:rpm]

galaxy.yml

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

1515
namespace: cloudera
1616
name: cluster
17-
version: 3.4.1
17+
version: 3.4.2
1818

1919
authors: []
2020
readme: README.md

0 commit comments

Comments
 (0)