From 91cc9f33f067ca889f6f7b9abccc78e8ae4d026a Mon Sep 17 00:00:00 2001 From: Andrey Butirsky Date: Fri, 29 Dec 2023 18:09:24 +0300 Subject: [PATCH 1/8] Update README.md: fix broken link to Wiki --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 792c2358..96aaa126 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,7 @@ The easiest way is to look at the screenshots (the whole process is five steps o The links to download these files will show up under _Compiling progress_ field (look at the bottom of the last screenshot). **These links will show up only when compilation is successful**. -You have to upload only `firmware.bin` or `firmawre.bin.gz` file to your device. How to do that is perfeclty described on [Tasmota wiki](https://github.com/arendst/Sonoff-Tasmota/wiki/Flashing). +You have to upload only `firmware.bin` or `firmawre.bin.gz` file to your device. How to do that is perfeclty described on [Tasmota docs](https://tasmota.github.io/docs/Upgrading/). ![Step01](./docs/images/step01.png) ![Step02](./docs/images/step02.png) From b881603c60793f9c31830b0a77c2743d439eeede Mon Sep 17 00:00:00 2001 From: Piotr Antczak Date: Sun, 7 Jan 2024 14:29:26 +0100 Subject: [PATCH 2/8] feat: Add workflow to build docker image --- .github/workflows/build-docker-image.yaml | 61 +++++++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 .github/workflows/build-docker-image.yaml diff --git a/.github/workflows/build-docker-image.yaml b/.github/workflows/build-docker-image.yaml new file mode 100644 index 00000000..4e58f200 --- /dev/null +++ b/.github/workflows/build-docker-image.yaml @@ -0,0 +1,61 @@ +name: Build Docker Image +on: + workflow_dispatch: + inputs: + branch: + description: 'Branch to build from' + required: true + default: 'master' + options: + - 'master' + - 'development' + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - name: Checkout code + uses: actions/checkout@v2 + with: + ref: ${{ github.event.inputs.branch }} + + - name: Set up QEMU + uses: docker/setup-qemu-action@v1 + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v1 + + - name: Install jq + run: sudo apt-get update && sudo apt-get install -y jq + + - name: Load Buildx + run: docker buildx create --name mybuilder --use + if: runner.os == 'Linux' + + - name: Login to Docker Hub + uses: docker/login-action@v1 + with: + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_ACCESS_TOKEN }} + + - name: Extract version from package.json + if: ${{ github.event.inputs.branch }} != 'development' + run: echo "DOCKER_TAG=$(jq -r '.version' package.json)" >> $GITHUB_ENV + + - name: Build and push production Docker image + if: ${{ github.event.inputs.branch }} != 'development' + run: | + docker buildx build \ + --platform linux/amd64,linux/arm64,linux/arm/v7 \ + -t benzino77/tasmocompiler:$DOCKER_TAG \ + -t benzino77/tasmocompiler:latest \ + -f Dockerfile . + + - name: Build and push development Docker image + if: ${{ github.event.inputs.branch }} != 'development' + run: | + docker buildx build \ + --platform linux/amd64,linux/arm64,linux/arm/v7 \ + -t benzino77/tasmocompiler:development \ + -f Dockerfile . From 6ca0b3f1bd5e38d2650e112916afd1443682f002 Mon Sep 17 00:00:00 2001 From: Piotr Antczak Date: Sun, 7 Jan 2024 14:39:25 +0100 Subject: [PATCH 3/8] feat: No need to install jq it is already there --- .github/workflows/build-docker-image.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/build-docker-image.yaml b/.github/workflows/build-docker-image.yaml index 4e58f200..d7498df2 100644 --- a/.github/workflows/build-docker-image.yaml +++ b/.github/workflows/build-docker-image.yaml @@ -26,9 +26,6 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v1 - - name: Install jq - run: sudo apt-get update && sudo apt-get install -y jq - - name: Load Buildx run: docker buildx create --name mybuilder --use if: runner.os == 'Linux' From 9f03f5c682314c93690fb7f7385173f4d9fd3bd7 Mon Sep 17 00:00:00 2001 From: Piotr Antczak Date: Sun, 7 Jan 2024 14:40:05 +0100 Subject: [PATCH 4/8] feat: change the input type to choice --- .github/workflows/build-docker-image.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-docker-image.yaml b/.github/workflows/build-docker-image.yaml index d7498df2..0ecbe506 100644 --- a/.github/workflows/build-docker-image.yaml +++ b/.github/workflows/build-docker-image.yaml @@ -5,6 +5,7 @@ on: branch: description: 'Branch to build from' required: true + type: choice default: 'master' options: - 'master' From a83b7dd7125a507021d25f701557ada5376a84d1 Mon Sep 17 00:00:00 2001 From: Piotr Antczak Date: Sun, 7 Jan 2024 14:56:42 +0100 Subject: [PATCH 5/8] fix: change if condition --- .github/workflows/build-docker-image.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-docker-image.yaml b/.github/workflows/build-docker-image.yaml index 0ecbe506..359664a7 100644 --- a/.github/workflows/build-docker-image.yaml +++ b/.github/workflows/build-docker-image.yaml @@ -38,11 +38,11 @@ jobs: password: ${{ secrets.DOCKER_ACCESS_TOKEN }} - name: Extract version from package.json - if: ${{ github.event.inputs.branch }} != 'development' + if: ${{ github.event.inputs.branch == 'master' }} run: echo "DOCKER_TAG=$(jq -r '.version' package.json)" >> $GITHUB_ENV - name: Build and push production Docker image - if: ${{ github.event.inputs.branch }} != 'development' + if: ${{ github.event.inputs.branch == 'master' }} run: | docker buildx build \ --platform linux/amd64,linux/arm64,linux/arm/v7 \ @@ -51,7 +51,7 @@ jobs: -f Dockerfile . - name: Build and push development Docker image - if: ${{ github.event.inputs.branch }} != 'development' + if: ${{ github.event.inputs.branch == 'development' }} run: | docker buildx build \ --platform linux/amd64,linux/arm64,linux/arm/v7 \ From 0be38a7fc9ece2dacf78f9e24ed1d8d084cdbe9e Mon Sep 17 00:00:00 2001 From: Piotr Antczak Date: Sun, 7 Jan 2024 15:29:40 +0100 Subject: [PATCH 6/8] feat: add push option do docker build --- .github/workflows/build-docker-image.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-docker-image.yaml b/.github/workflows/build-docker-image.yaml index 359664a7..49a417bf 100644 --- a/.github/workflows/build-docker-image.yaml +++ b/.github/workflows/build-docker-image.yaml @@ -48,7 +48,7 @@ jobs: --platform linux/amd64,linux/arm64,linux/arm/v7 \ -t benzino77/tasmocompiler:$DOCKER_TAG \ -t benzino77/tasmocompiler:latest \ - -f Dockerfile . + -f Dockerfile --push . - name: Build and push development Docker image if: ${{ github.event.inputs.branch == 'development' }} @@ -56,4 +56,4 @@ jobs: docker buildx build \ --platform linux/amd64,linux/arm64,linux/arm/v7 \ -t benzino77/tasmocompiler:development \ - -f Dockerfile . + -f Dockerfile --push . From 806325953432d9b07641d67dedd77f3a4a005136 Mon Sep 17 00:00:00 2001 From: Piotr Antczak Date: Sun, 18 Feb 2024 15:45:28 +0100 Subject: [PATCH 7/8] fix: Add `USE_ENERGY_SENSOR` as dependency for shutter/blinds feature #390 --- src/components/AppStepper/FeaturesStep/AvailableFeatures.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/AppStepper/FeaturesStep/AvailableFeatures.js b/src/components/AppStepper/FeaturesStep/AvailableFeatures.js index 5acd9348..4e834469 100644 --- a/src/components/AppStepper/FeaturesStep/AvailableFeatures.js +++ b/src/components/AppStepper/FeaturesStep/AvailableFeatures.js @@ -427,6 +427,7 @@ const availableFeatures = [ '//!!! Please read https://tasmota.github.io/docs/Blinds-and-Shutters/#specific-configuration to understand what this option is for !!!\n' + '\n' + '//#define SHUTTER_CLEAR_PWM_ONSTOP\n', + include: ['USE_ENERGY_SENSOR'], boards: ['all'], }, { From f3a0f3a64b3cdeccad058f10d422351e7aca8ed7 Mon Sep 17 00:00:00 2001 From: Piotr Antczak Date: Sun, 18 Feb 2024 15:52:19 +0100 Subject: [PATCH 8/8] fix: Include `bluetooth` feature for ESP32-S3 boards #386 --- src/components/AppStepper/FeaturesStep/AvailableFeatures.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/AppStepper/FeaturesStep/AvailableFeatures.js b/src/components/AppStepper/FeaturesStep/AvailableFeatures.js index 4e834469..82d3be2e 100644 --- a/src/components/AppStepper/FeaturesStep/AvailableFeatures.js +++ b/src/components/AppStepper/FeaturesStep/AvailableFeatures.js @@ -402,7 +402,7 @@ const availableFeatures = [ lib_extra_dirs: ['lib/libesp32', 'lib/libesp32_div', 'lib/lib_basic', 'lib/lib_i2c', 'lib/lib_ssl'], }, custom: '', - boards: ['esp32generic', 'esp32webcam', 'esp32odroid-go', 'esp32m5', 'esp32solo1', 'esp32c3'], + boards: ['esp32generic', 'esp32webcam', 'esp32odroid-go', 'esp32m5', 'esp32solo1', 'esp32c3', 'esp32s3'], }, { name: 'USE_ETHERNET',