Skip to content

Commit 35abed0

Browse files
committed
Merge origin/main into cadt-prerelease-and-v2-config
Resolve conflicts in cadt/tasks/main.yml: keep main's conservative version check logic and dynamic config path from PR #467.
2 parents 7a9a218 + 0727413 commit 35abed0

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

cadt/tasks/main.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,14 +49,14 @@
4949
- name: Determine CADT config format
5050
ansible.builtin.set_fact:
5151
cadt_use_v2_config: >-
52-
{{ cadt_api_version == 'latest' or
53-
(cadt_api_version | regex_replace('[-~]rc\d+$', '') is version('1.7.26', '>=')) }}
52+
{{ cadt_api_version != 'latest' and
53+
(cadt_api_version | regex_replace('[-~]rc\d+$', '') is version('1.7.26', '>=')) }}
5454
tags: cadt
5555

5656
- name: Add CADT config file
5757
ansible.builtin.template:
5858
src: "{{ (cadt_use_v2_config | bool) | ternary('config-v2.yaml.j2', 'config.yaml.j2') }}"
59-
dest: "{{ chia_root }}/cadt/v1/config.yaml"
59+
dest: "{{ chia_root }}/cadt/{{ (cadt_use_v2_config | bool) | ternary('', 'v1/') }}config.yaml"
6060
owner: "{{ user }}"
6161
group: "{{ user }}"
6262
mode: '0644'

chia-blockchain/tasks/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@
200200
PATH: "/home/{{ user }}/chia-blockchain/venv/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
201201
CHIA_ROOT: "{{ chia_root }}"
202202
when:
203-
- keys | length
203+
- keys | length > 0
204204
with_items: "{{ keys }}"
205205

206206
# @TODO This is specific to source installs. Need to move to source tasks and add the equivalent for apt installs

0 commit comments

Comments
 (0)