From 951d6bc26e705e04675a614053748de5660dec7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Igor=20Pe=C4=8Dovnik?=
 <igorpecovnik@users.noreply.github.com>
Date: Thu, 10 Jun 2021 23:28:33 +0200
Subject: [PATCH] CI needs to merge nightly from master before start (#2892)

Also changed cronjob for start
---
 .github/workflows/build.yml | 49 ++++++++++++++++++++++++++++++++++---
 1 file changed, 46 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 09f3d52be..e65b5fa8b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -2,18 +2,59 @@ name: Build
 
 on:
   schedule:
-    - cron:  '0 */8 * * *'
+    - cron:  '0 4 * * *'
 
   workflow_dispatch:
 
-#  push:
-#    branches: master
 
 jobs:
 
+    merge:
+
+      name: Merge nightly
+      runs-on: [self-hosted, Linux, x64]
+      if: ${{ github.repository_owner == 'Armbian' }}
+      steps:
+
+        - name: Checkout Armbian build script
+
+          uses: actions/checkout@v2
+          with:
+            fetch-depth: 0
+            repository: armbian/build
+            path: build
+            ref: nightly
+            clean: false
+
+        - name: Import GPG key
+
+          uses: crazy-max/ghaction-import-gpg@v3
+          with:
+            gpg-private-key: ${{ secrets.GPG_KEY2 }}
+            passphrase: ${{ secrets.GPG_PASSPHRASE2 }}
+            workdir: build
+            git-user-signingkey: true
+            git-commit-gpgsign: true
+
+        - name: Merge master into nightly
+
+          run: |
+
+            cd build
+            git config --global user.email "info@armbian.com"
+            git config --global user.name "Armbianworker"
+            git checkout master
+            git fetch
+            git merge origin/master
+            git checkout nightly
+            git merge master nightly
+            git push
+
+
     cache:
 
       name: Create rootfs cache
+      needs: merge
       runs-on: [self-hosted, Linux, x64, cache]
       if: ${{ github.repository_owner == 'Armbian' }}
       steps:
@@ -175,6 +216,7 @@ jobs:
       #
 
       name: Changed beta kernels
+      needs: merge
       runs-on: [self-hosted, Linux, x64, big]
       if: ${{ github.repository_owner == 'Armbian' }}
       steps:
@@ -318,6 +360,7 @@ jobs:
       #
 
       name: Changed stable edge kernels
+      needs: merge
       runs-on: [self-hosted, Linux, x64, big]
       if: ${{ github.repository_owner == 'Armbian' }}
       steps: