Merge pull request #171 from MonolithProjects/fix/github_enterprise_var

fix github_enterprise var conditionals and restart task

Author: MonolithProjects

tasks/assert.yml

@@ -5,7 +5,7 @@
       - github_account is defined
     fail_msg: "github_account is not defined"
   run_once: true
-  when: not github_enterprise
+  when: github_enterprise is not defined
 
 - name: Check access_token variable (RUN ONCE)
   ansible.builtin.assert:
@@ -21,7 +21,7 @@
       - runner_org | bool == True or runner_org == False
     fail_msg: "runner_org should be a boolean value"
   run_once: true
-  when: not github_enterprise
+  when: github_enterprise is not defined
 
 - name: Check github_repo variable (RUN ONCE)
   ansible.builtin.assert:
@@ -30,4 +30,4 @@
       - github_repo | length > 0
     fail_msg: "github_repo was not found or is using an invalid format."
   run_once: true
-  when: not runner_org and not github_enterprise
+  when: not runner_org and github_enterprise is not defined

tasks/collect_info.yml

@@ -5,17 +5,17 @@
     - name: Set complete API url for repo runner
       ansible.builtin.set_fact:
         github_full_api_url: "{{ github_api_url }}/repos/{{ github_owner | default(github_account) }}/{{ github_repo }}/actions/runners"
-      when: not runner_org and not github_enterprise
+      when: not runner_org and github_enterprise is not defined
 
     - name: Set complete API url for org runner
       ansible.builtin.set_fact:
         github_full_api_url: "{{ github_api_url }}/orgs/{{ github_owner | default(github_account) }}/actions/runners"
-      when: runner_org | bool and not github_enterprise
+      when: runner_org | bool and github_enterprise is not defined
 
     - name: Set complete API url for enterprise runner
       ansible.builtin.set_fact:
         github_full_api_url: "{{ github_api_url }}/enterprises/{{ github_enterprise }}/actions/runners"
-      when: github_enterprise
+      when: github_enterprise is defined
 
     - name: Get registration token (RUN ONCE)
       ansible.builtin.uri:

tasks/install_runner.yml

@@ -51,17 +51,17 @@
 - name: Set complete GitHub url for repo runner
   ansible.builtin.set_fact:
     github_full_url: "{{ github_url }}/{{ github_owner | default(github_account) }}/{{ github_repo }}"
-  when: not runner_org and not github_enterprise
+  when: not runner_org and github_enterprise is not defined
 
 - name: Set complete GitHub url for org runner
   ansible.builtin.set_fact:
     github_full_url: "{{ github_url }}/{{ github_owner | default(github_account) }}"
-  when: runner_org | bool and not github_enterprise
+  when: runner_org | bool and github_enterprise is not defined
 
 - name: Set complete GitHub url for enterprise runner
   ansible.builtin.set_fact:
     github_full_url: "{{ github_url }}/enterprises/{{ github_enterprise }}"
-  when: github_enterprise
+  when: github_enterprise is defined
 
 - name: Register runner
   environment:
@@ -150,7 +150,7 @@
   when: runner_state|lower == "stopped"
 
 - name: Version changed - RESTART Github Actions Runner service
-  ansible.builtin.command: "./svc.sh stop && sleep 5 && ./svc.sh start"
+  ansible.builtin.shell: "./svc.sh stop && sleep 5 && ./svc.sh start"
   args:
     chdir: "{{ runner_dir }}"
   changed_when: true