Merge CI to deduplicate events (#1279)
This commit is contained in:
Riku Isokoski
GitHub
parent
69563ed031
commit
f53e75063b
2 changed files with 42 additions and 81 deletions
72
.github/workflows/lv_sim.yml
vendored
72
.github/workflows/lv_sim.yml
vendored
|
|
@ -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
|
|
||||||
51
.github/workflows/main.yml
vendored
51
.github/workflows/main.yml
vendored
|
|
@ -1,10 +1,6 @@
|
||||||
# GitHub Actions Workflow to build FreeRTOS Firmware for PineTime Smart Watch
|
name: CI
|
||||||
# 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
|
|
||||||
|
|
||||||
|
# Run this workflow whenever the build may be affected
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
branches: [ master, develop ]
|
branches: [ master, develop ]
|
||||||
|
|
@ -14,11 +10,9 @@ on:
|
||||||
branches: [ develop ]
|
branches: [ develop ]
|
||||||
paths-ignore:
|
paths-ignore:
|
||||||
- 'doc/**'
|
- 'doc/**'
|
||||||
# Allows you to run this workflow manually from the Actions tab
|
|
||||||
workflow_dispatch:
|
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build:
|
build-firmware:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
container:
|
container:
|
||||||
image: infinitime/infinitime-build
|
image: infinitime/infinitime-build
|
||||||
|
|
@ -51,3 +45,42 @@ jobs:
|
||||||
with:
|
with:
|
||||||
name: InfiniTime MCUBoot image ${{ github.head_ref }}
|
name: InfiniTime MCUBoot image ${{ github.head_ref }}
|
||||||
path: ./build/output/pinetime-mcuboot-app-image-*.bin
|
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
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue