From e1a5781451549df53c3504799573b75d1365eeed Mon Sep 17 00:00:00 2001 From: paperbenni Date: Wed, 11 Jan 2023 18:26:55 +0100 Subject: [PATCH 1/2] hacky fix for armv7 --- tasks/gather-state.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tasks/gather-state.yml b/tasks/gather-state.yml index c66f613..13c869f 100644 --- a/tasks/gather-state.yml +++ b/tasks/gather-state.yml @@ -17,7 +17,7 @@ - name: Get active toolchain version ansible.builtin.shell: - cmd: "rustup default | grep -Po '^.*?(?=-{{ ansible_architecture }})'" + cmd: "rustup default | sed 's/armv7l/armv7/g' | grep -Po '^.*?(?=-{{ ansible_architecture }})'" register: rustup_default_output environment: RUSTUP_HOME: "{{ rustup_user_home }}/{{ rustup_home_suffix }}" From edc34c8ea2b738ebd343d3b824e64994e628866f Mon Sep 17 00:00:00 2001 From: paperbenni Date: Thu, 16 Nov 2023 18:25:56 +0100 Subject: [PATCH 2/2] fix arm name rustup uses a different naming scheme from ansible, the name needs to be replaced for arm to work. not sure if more architectures have this problem --- tasks/set-toolchain.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tasks/set-toolchain.yml b/tasks/set-toolchain.yml index 52de65f..fb2ecbc 100644 --- a/tasks/set-toolchain.yml +++ b/tasks/set-toolchain.yml @@ -2,7 +2,7 @@ - name: Get active toolchain version ansible.builtin.shell: - cmd: "rustup default | grep -Po '^.*?(?=-{{ ansible_architecture }})'" + cmd: "rustup default | sed 's/armv7l/armv7/g' | grep -Po '^.*?(?=-{{ ansible_architecture }})'" register: rustup_default_output environment: RUSTUP_HOME: "{{ rustup_user_home }}/{{ rustup_home_suffix }}"