From f53e75063b6ef618d65a1f287df52ba01c3351f5 Mon Sep 17 00:00:00 2001
From: Riku Isokoski <riksu9000@gmail.com>
Date: Thu, 25 Aug 2022 08:32:46 +0300
Subject: [PATCH] Merge CI to deduplicate events (#1279)

---
 .github/workflows/lv_sim.yml | 72 ------------------------------------
 .github/workflows/main.yml   | 51 ++++++++++++++++++++-----
 2 files changed, 42 insertions(+), 81 deletions(-)
 delete mode 100644 .github/workflows/lv_sim.yml

diff --git a/.github/workflows/lv_sim.yml b/.github/workflows/lv_sim.yml
deleted file mode 100644
index 503f5780..00000000
--- a/.github/workflows/lv_sim.yml
+++ /dev/null
@@ -1,72 +0,0 @@
-# GitHub Actions Workflow to build Simulator for PineTime Smart Watch LVGL Interface
-
-name: Build PineTime LVGL Simulator
-
-on:
-  push:
-    branches: [ master, develop ]
-    paths-ignore:
-      - 'doc/**'
-  pull_request:
-    branches: [ develop ]
-    paths-ignore:
-      - 'doc/**'
-  # Allows you to run this workflow manually from the Actions tab
-  workflow_dispatch:
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    steps:
-
-      #########################################################################################
-      # Download and Install Dependencies
-
-      - name: Install cmake
-        uses: lukka/get-cmake@v3.18.3
-
-      - name: Install SDL2 development package
-        run:  |
-          sudo apt-get update
-          sudo apt-get -y install libsdl2-dev
-
-      - name: Install lv_font_conv
-        run:
-          npm i -g lv_font_conv@1.5.2
-
-      #########################################################################################
-      # Checkout
-
-      - name: Checkout source files
-        uses: actions/checkout@v2
-        with:
-          submodules: recursive
-
-      #########################################################################################
-      # get InfiniSim repo
-
-      - name: Get InfiniSim repo
-        run:  |
-          git clone https://github.com/InfiniTimeOrg/InfiniSim.git --depth 1 --branch main
-          git -C InfiniSim submodule update --init lv_drivers libpng
-
-      #########################################################################################
-      # CMake
-
-      - name: CMake
-        run:  |
-          cmake -G Ninja -S InfiniSim -B build_lv_sim -DInfiniTime_DIR="${PWD}"
-
-      #########################################################################################
-      # Build and Upload simulator
-
-      - name: Build simulator executable
-        run:  |
-          cmake --build build_lv_sim
-
-      - name: Upload simulator executable
-        uses: actions/upload-artifact@v3
-        with:
-          name: infinisim-${{ github.head_ref }}
-          path: build_lv_sim/infinisim
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 45aac7ca..b8a70b6e 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -1,10 +1,6 @@
-# GitHub Actions Workflow to build FreeRTOS Firmware for PineTime Smart Watch
-# See https://lupyuen.github.io/pinetime-rust-mynewt/articles/cloud
-# Based on https://github.com/JF002/InfiniTime/blob/master/doc/buildAndProgram.md
-# and https://github.com/JF002/InfiniTime/blob/master/bootloader/README.md
-
-name: Build PineTime Firmware
+name: CI
 
+# Run this workflow whenever the build may be affected
 on:
   push:
     branches: [ master, develop ]
@@ -14,11 +10,9 @@ on:
     branches: [ develop ]
     paths-ignore:
       - 'doc/**'
-  # Allows you to run this workflow manually from the Actions tab
-  workflow_dispatch:
 
 jobs:
-  build:
+  build-firmware:
     runs-on: ubuntu-latest
     container:
       image: infinitime/infinitime-build
@@ -51,3 +45,42 @@ jobs:
         with:
           name: InfiniTime MCUBoot image ${{ github.head_ref }}
           path: ./build/output/pinetime-mcuboot-app-image-*.bin
+
+  build-simulator:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Install cmake
+      uses: lukka/get-cmake@v3.18.3
+
+    - name: Install SDL2 development package
+      run:  |
+        sudo apt-get update
+        sudo apt-get -y install libsdl2-dev
+
+    - name: Install lv_font_conv
+      run:
+        npm i -g lv_font_conv@1.5.2
+
+    - name: Checkout source files
+      uses: actions/checkout@v2
+      with:
+        submodules: recursive
+
+    - name: Get InfiniSim repo
+      run:  |
+        git clone https://github.com/InfiniTimeOrg/InfiniSim.git --depth 1 --branch main
+        git -C InfiniSim submodule update --init lv_drivers libpng
+
+    - name: CMake
+      run:  |
+        cmake -G Ninja -S InfiniSim -B build_lv_sim -DInfiniTime_DIR="${PWD}"
+
+    - name: Build simulator executable
+      run:  |
+        cmake --build build_lv_sim
+
+    - name: Upload simulator executable
+      uses: actions/upload-artifact@v3
+      with:
+        name: infinisim-${{ github.head_ref }}
+        path: build_lv_sim/infinisim