From 338190747188a6fb6f42c689bd0a2e2670554eca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Ku=C5=BAnia?= <rafal.kuznia@nordicsemi.no>
Date: Thu, 27 Aug 2020 10:51:47 +0200
Subject: [PATCH] [github] move nRF Connect build configuration

---
 .github/workflows/examples-autotools.yaml | 46 -----------------------
 .github/workflows/examples.yaml           | 45 ++++++++++++++++++++++
 2 files changed, 45 insertions(+), 46 deletions(-)

diff --git a/.github/workflows/examples-autotools.yaml b/.github/workflows/examples-autotools.yaml
index cc4f55cfe38d5c..44d74e991364ab 100644
--- a/.github/workflows/examples-autotools.yaml
+++ b/.github/workflows/examples-autotools.yaml
@@ -64,49 +64,3 @@ jobs:
                       ${{ env.BUILD_TYPE }}-example-build-${{
                       steps.outsuffix.outputs.value }}
                   path: /tmp/output_binaries/${{ env.BUILD_TYPE }}-build
-
-    nrfconnect:
-        name: nRF Connect SDK
-
-        env:
-            BUILD_TYPE: nrfconnect
-
-        runs-on: ubuntu-latest
-
-        container:
-            image: connectedhomeip/chip-build-nrf-platform:0.4.1
-            volumes:
-                - "/tmp/bloat_reports:/tmp/bloat_reports"
-                - "/tmp/output_binaries:/tmp/output_binaries"
-
-        steps:
-            - name: Checkout
-              uses: actions/checkout@v2
-              # Fetch depth 0 to get all history and be able to check mergepoint for bloat report
-              with:
-                  fetch-depth: 0
-                  submodules: true
-            - name: Build example nRF Connect SDK Lock App
-              run: scripts/examples/nrfconnect_lock_app.sh
-            - name: Copy aside build products
-              run: |
-                  mkdir -p example_binaries/$BUILD_TYPE-build
-                  cp examples/lock-app/nrfconnect/build/zephyr/zephyr.elf       \
-                     example_binaries/$BUILD_TYPE-build/chip-nrf52840-lock-example.elf
-            - name: Binary artifact suffix
-              id: outsuffix
-              uses: haya14busa/action-cond@v1.0.0
-              with:
-                  cond: ${{ github.event.pull_request.number == '' }}
-                  if_true: "${{ github.sha }}"
-                  if_false: "pull-${{ github.event.pull_request.number }}"
-            - name: Copy aside bloat report & binaries
-              run: |
-                  cp -r example_binaries/$BUILD_TYPE-build /tmp/output_binaries/
-            - name: Uploading Binaries
-              uses: actions/upload-artifact@v1
-              with:
-                  name:
-                      ${{ env.BUILD_TYPE }}-example-build-${{
-                      steps.outsuffix.outputs.value }}
-                  path: /tmp/output_binaries/${{ env.BUILD_TYPE }}-build
diff --git a/.github/workflows/examples.yaml b/.github/workflows/examples.yaml
index 4e952ce408c91f..3f3eb353ab250d 100644
--- a/.github/workflows/examples.yaml
+++ b/.github/workflows/examples.yaml
@@ -158,3 +158,48 @@ jobs:
                       steps.outsuffix.outputs.value }}
                   path: |
                       out/lock_app_debug/BRD4161A/chip-efr32-lock-example.out
+
+    nrfconnect:
+        name: nRF Connect SDK
+        env:
+            BUILD_TYPE: nrfconnect
+
+        runs-on: ubuntu-latest
+
+        container:
+            image: connectedhomeip/chip-build-nrf-platform:0.4.1
+            volumes:
+                - "/tmp/bloat_reports:/tmp/bloat_reports"
+                - "/tmp/output_binaries:/tmp/output_binaries"
+
+        steps:
+            - name: Checkout
+              uses: actions/checkout@v2
+              # Fetch depth 0 to get all history and be able to check mergepoint for bloat report
+              with:
+                  fetch-depth: 0
+                  submodules: true
+            - name: Build example nRF Connect SDK Lock App
+              run: scripts/examples/nrfconnect_lock_app.sh
+            - name: Copy aside build products
+              run: |
+                  mkdir -p example_binaries/$BUILD_TYPE-build
+                  cp examples/lock-app/nrfconnect/build/zephyr/zephyr.elf       \
+                      example_binaries/$BUILD_TYPE-build/chip-nrf52840-lock-example.elf
+            - name: Binary artifact suffix
+              id: outsuffix
+              uses: haya14busa/action-cond@v1.0.0
+              with:
+                  cond: ${{ github.event.pull_request.number == '' }}
+                  if_true: "${{ github.sha }}"
+                  if_false: "pull-${{ github.event.pull_request.number }}"
+            - name: Copy aside bloat report & binaries
+              run: |
+                  cp -r example_binaries/$BUILD_TYPE-build /tmp/output_binaries/
+            - name: Uploading Binaries
+              uses: actions/upload-artifact@v1
+              with:
+                  name:
+                      ${{ env.BUILD_TYPE }}-example-build-${{
+                      steps.outsuffix.outputs.value }}
+                  path: /tmp/output_binaries/${{ env.BUILD_TYPE }}-build