fixing obvious errors

This commit is contained in:
Matthew Stobbs
2026-02-06 01:28:14 -07:00
parent e91e7e9698
commit b87fc8235e
10 changed files with 149 additions and 181 deletions

View File

@@ -2,64 +2,50 @@
---
- name: Cargo source install helper
block:
- name: Set build variables
ansible.builtin.set_fact:
git_path: "{{ d_tempdir.path }}/{{ pkg.name }}"
git_repo: "{{ pkg.repo }}"
git_depth: "{{ pkg.depth | default(1) }}"
git_recursive: "{{ pkg.recursive | default(true) }}"
git_version: "{{ pkg.version | default(omit) }}"
- name: Fetch git repo
vars:
git:
path: "{{ d_cache.path }}/{{ cargo_build.name }}"
repo: "{{ cargo_build.repo }}"
depth: "{{ cargo_build.depth | default(1) }}"
force: "{{ cargo_build.force_git | default(true) }}"
recursive: "{{ cargo_build.recursive | default(true) }}"
version: "{{ cargo_build.version | default(omit) }}"
ansible.builtin.include_tasks:
file: helpers/git.yml
- name: Build cargo release
ansible.builtin.command:
creates: "{{ pkg.bin_output }}"
chdir: "{{ pkg.path }}"
argv: "{{ [cargo, build] + pkg.build_flags }}"
chdir: "{{ d_cache.path }}/{{ cargo_build.name }}"
argv: "{{ [cargo, build] + cargo_build.build_flags }}"
- name: Install cargo release
block:
- name: Install binary
when:
- bin_name is defined
- bin_output is defined
become: true
- name: Create missing directories
become: "{{ install_become }}"
become_user: "{{ install_become_user }}"
loop: "{{ cargo_build.files }}"
loop_control:
loop_var: file
ansible.builtin.file:
state: directory
path: "{{ install_prefix }}/{{ file.to | dirname }}"
mode: '0755'
owner: "{{ cargo_build.owner | default(ansible_user_id) }}"
group: "{{ cargo_build.group | default(ansible_user_gid) }}"
- name: Install release files
become: "{{ install_become }}"
become_user: "{{ install_become_user }}"
loop: "{{ cargo_build.files }}"
loop_control:
loop_var: file
ansible.builtin.copy:
backup: false
dest: "{{ install_prefix }}/bin/{{ bin_name }}"
owner: root
group: root
mode: "0755"
remote_src: true
src: "{{ git_path }}/{{ bin_output }}"
- name: Install additional files
when:
- install_files is defined
block:
- name: Create missing directories
loop: "{{ install_files | dict2items }}"
loop_control:
loop_var: file
ansible.builtin.file:
path: "{{ install_prefix }}/{{ file.value | dirname }}"
owner: root
group: root
mode: "0755"
state: directory
- name: Copy extra files
loop: "{{ install_files | dict2items }}"
loop_control:
loop_var: file
ansible.builtin.copy:
backup: false
dest: "{{ install_prefix }}/{{ file.value }}"
owner: root
group: root
mode: "0644"
remote_src: true
src: "{{ git_path }}/{{ file.key }}"
src: "{{ d_cache.path }}/{{ cargo_build.name }}/{{ file.from }}"
dest: "{{ install_prefix }}/{{ file.to }}"
owner: "{{ cargo_build.owner | default(ansible_user_id) }}"
group: "{{ cargo_build.group | default(ansible_user_gid) }}"
mode: "{{ file.mode | default('0644') }}"
force: "{{ file.force | default(true) }}"