From 2cb3ac285c884dc765da2ea2c01ead5412ffad53 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Fri, 11 Sep 2020 09:46:43 +0200
Subject: [PATCH] Update main.yml

---
 .github/workflows/main.yml | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 6535bb464..b1348bfb7 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -19,17 +19,23 @@ jobs:
         REPO_URL: https://github.com/ysurac/openmptcprouter
         REPO_BRANCH: develop
       run: |
-        git clone --depth 1 $REPO_URL -b $REPO_BRANCH openwrt
+        git clone --depth 1 $REPO_URL -b $REPO_BRANCH openmptcprouter
     - name: Build toolchain
+      working-directory: /openmptcprouter
       env:
         OMR_TARGET: ${{matrix.OMR_TARGET}}
+        OMR_FEED_URL: https://github.com/ysurac/openmptcprouter-feeds
+        OMR_FEED_SRC: develop
       run: |
-        cd openmptcprouter
-        git checkout develop || true
-        git pull || true
-        export OMR_FEED_URL="https://github.com/ysurac/openmptcprouter-feeds"
-        export OMR_FEED_SRC="develop"
-        sh build.sh -j$(nproc)
+        sh build.sh prepare {tools,toolchain}/install -j$(nproc)
         #echo -e "$OMR_PRIVKEY" > /home/runner/work/openmptcprouter-feeds/openmptcprouter-feeds/openmptcprouter/${{ env.OMR_TARGET }}/source/key-build
         #echo -e "$OMR_PUBKEY" > /home/runner/work/openmptcprouter-feeds/openmptcprouter-feeds/openmptcprouter/${{ env.OMR_TARGET }}/source/key-build.pub
+    - name: Build packages
+      working-directory: /openmptcprouter
+      run: |
+        make IGNORE_ERRORS=m package/{compile,install,index} -j$(nproc)
+    - name: Build image
+      working-directory: /openmptcprouter
+      run: |
+        make IGNORE_ERRORS=m target/install -j$(nproc)