From 337bda905d551663e23d8d04776a7beed122aaa0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Soko=C5=82owski?= <jakub@status.im>
Date: Thu, 22 Jul 2021 17:03:59 +0200
Subject: [PATCH] rename tasks/schedule to tasks/build, use relative path
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jakub Sokołowski <jakub@status.im>
---
 defaults/main.yml                 | 1 -
 tasks/{schedule.yml => build.yml} | 8 +++++++-
 tasks/install.yml                 | 6 ------
 tasks/main.yml                    | 2 +-
 4 files changed, 8 insertions(+), 9 deletions(-)
 rename tasks/{schedule.yml => build.yml} (87%)

diff --git a/defaults/main.yml b/defaults/main.yml
index 4dc7adf..fceaf99 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -10,7 +10,6 @@ beacon_node_service_exe: '{{ beacon_node_service_bin_path }}\nimbus_beacon_node.
 beacon_node_repo_url: 'https://github.com/status-im/nimbus-eth2.git'
 beacon_node_repo_branch: 'stable'
 beacon_node_repo_path: '{{ beacon_node_service_path }}\repo'
-beacon_node_build_script: '{{ beacon_node_service_path }}\build.sh'
 beacon_node_build_frequency: 'daily'
 beacon_node_build_start_time: '01:00:00'
 
diff --git a/tasks/schedule.yml b/tasks/build.yml
similarity index 87%
rename from tasks/schedule.yml
rename to tasks/build.yml
index b358b13..7108333 100644
--- a/tasks/schedule.yml
+++ b/tasks/build.yml
@@ -1,4 +1,10 @@
 ---
+- name: Create build script
+  win_template:
+    src: 'build.sh.j2'
+    dest: '{{ beacon_node_service_path }}\build.sh'
+    mode: 0750
+
 - name: Schedule and start node builds
   win_scheduled_task:
     description: 'Daily rebuild of Nimbus beacon node binaries'
@@ -6,7 +12,7 @@
     username: SYSTEM
     actions:
       - path: 'C:\ProgramData\scoop\apps\git\current\bin\bash.exe'
-        arguments: '-c "{{ beacon_node_build_script }} > .\build.log 2>&1"'
+        arguments: '-c "./build.sh > build.log 2>&1"'
         working_directory: '{{ beacon_node_service_path }}'
     triggers:
       - type: '{{ beacon_node_build_frequency }}'
diff --git a/tasks/install.yml b/tasks/install.yml
index 74b7967..557355b 100644
--- a/tasks/install.yml
+++ b/tasks/install.yml
@@ -49,9 +49,3 @@
   win_reboot:
     reboot_timeout: 160
   when: machine_path.changed
-
-- name: Create build script
-  win_template:
-    src: 'build.sh.j2'
-    dest: '{{ beacon_node_build_script }}'
-    mode: 0750
diff --git a/tasks/main.yml b/tasks/main.yml
index 1ce081f..b3e2968 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -2,7 +2,7 @@
 - import_tasks: checks.yml
 - import_tasks: user.yml
 - import_tasks: install.yml
-- import_tasks: schedule.yml
+- import_tasks: build.yml
 - import_tasks: service.yml
 - import_tasks: validators.yml
   when: beacon_node_dist_validators_enabled