Skip to content

Commit c7ced19

Browse files
Merge pull request #230 from vydrazde/fix/windows-install
Fix windows installation
2 parents 9a6aea9 + 617210a commit c7ced19

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

tasks/install_runner_win.yml

+7-7
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
when: runner_version == "latest"
1616

1717
- name: Check if desired version already installed
18-
ansible.windows.win_command: "grep -i {{ runner_version }} {{ runner_dir }}\\bin\\Runner.Listener.deps.json"
18+
ansible.windows.win_command: "findstr -i {{ runner_version }} {{ runner_dir }}\\bin\\Runner.Listener.deps.json"
1919
register: runner_installed
2020
check_mode: false
2121
changed_when: false
@@ -26,14 +26,14 @@
2626
url: "https://github.com/{{ runner_download_repository }}/releases/download/v{{ runner_version }}/\
2727
actions-runner-{{ github_actions_system }}-{{ github_actions_architecture }}-{{ runner_version }}.zip"
2828
dest: "%TEMP%\\actions-runner-{{ github_actions_system }}-{{ github_actions_architecture }}-{{ runner_version }}.zip"
29-
when: runner_version not in runner_installed.stdout or reinstall_runner
29+
when: runner_installed.stdout is not defined or runner_version not in runner_installed.stdout or reinstall_runner
3030

3131
- name: Unarchive runner package
3232
community.windows.win_unzip:
3333
src: "%TEMP%\\actions-runner-{{ github_actions_system }}-{{ github_actions_architecture }}-{{ runner_version }}.zip"
3434
dest: "{{ runner_dir }}\\"
3535
delete_archive: yes
36-
when: runner_version not in runner_installed.stdout or reinstall_runner
36+
when: runner_installed.stdout is not defined or runner_version not in runner_installed.stdout or reinstall_runner
3737

3838
- name: Configure custom env file if required
3939
randrej.windows.win_blockinfile:
@@ -116,27 +116,27 @@
116116
reinstall_runner
117117
118118
- name: Read service name from file
119-
ansible.windows.win_command: "cat {{ runner_dir }}\\.service"
119+
ansible.windows.win_shell: "type {{ runner_dir }}\\.service"
120120
register: runner_service
121121
changed_when: false
122122

123123
- name: START and enable Github Actions Runner service
124124
ansible.windows.win_service:
125-
name: "{{ runner_service.stdout }}"
125+
name: "{{ runner_service.stdout | trim }}"
126126
start_mode: auto
127127
state: started
128128
when: runner_state|lower == "started"
129129

130130
- name: STOP and disable Github Actions Runner service
131131
ansible.windows.win_service:
132-
name: "{{ runner_service.stdout }}"
132+
name: "{{ runner_service.stdout | trim }}"
133133
start_mode: manual
134134
state: stopped
135135
when: runner_state|lower == "stopped"
136136

137137
- name: Version changed - RESTART Github Actions Runner service
138138
ansible.windows.win_service:
139-
name: "{{ runner_service.stdout }}"
139+
name: "{{ runner_service.stdout | trim }}"
140140
start_mode: auto
141141
state: restarted
142142
when: runner_version not in runner_installed.stdout and not runner_state|lower == "stopped"

0 commit comments

Comments
 (0)