From d1246cf79116e52c291ea1b3eef09c220d7ee430 Mon Sep 17 00:00:00 2001 From: Markus Kirberg Date: Tue, 24 Dec 2024 11:39:03 +0100 Subject: [PATCH] try test step remove docker bla bla bla dockerfile --- .github/workflows/Dockerfile-mos | 7 +++++++ .github/workflows/build.yaml | 18 +++++++++--------- 2 files changed, 16 insertions(+), 9 deletions(-) create mode 100644 .github/workflows/Dockerfile-mos diff --git a/.github/workflows/Dockerfile-mos b/.github/workflows/Dockerfile-mos new file mode 100644 index 00000000..387a8daf --- /dev/null +++ b/.github/workflows/Dockerfile-mos @@ -0,0 +1,7 @@ +FROM ubuntu:22.04 + +RUN apt-get update && \ + apt-get install -y -q software-properties-common && add-apt-repository -y ppa:mongoose-os/mos && \ + apt -q install -y mos-latest docker.io make git && \ + apt-get clean && \ + rm -rf /var/lib/apt/lists/* diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index d7ff2605..f4bf1d67 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -5,7 +5,11 @@ on: jobs: build: name: Build ${{ matrix.model }} - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest + container: + image: ghcr.io/markirb/mos:latest + volumes: + - /home/runner/work:/home/runner/work strategy: fail-fast: false matrix: @@ -38,15 +42,11 @@ jobs: uses: actions/checkout@v4 with: fetch-depth: 0 - - name: Build docker image # remove if newer mos docker image is available - if: ${{ contains( matrix.model , 'Plus') || contains( matrix.model , 'Gen3') }} - run: docker build -t mgos/esp32-build:4.4.1-r7 -f .github/workflows/Dockerfile-esp32-build . - - name: Install mos build tool - run: | - sudo add-apt-repository -y ppa:mongoose-os/mos - sudo apt -q install -y mos-latest - name: Build - run: make ${{ matrix.model }} RELEASE=1 RELEASE_SUFFIX=$(.github/version.py --suffix) + run: | + cd /home/runner/work/shelly-homekit/shelly-homekit + git config --global --add safe.directory /home/runner/work/shelly-homekit/shelly-homekit + make ${{ matrix.model }} LOCAL=1 RELEASE=1 RELEASE_SUFFIX=$(.github/version.py --suffix) - name: Upload firmware artifacts uses: actions/upload-artifact@v4 with: