Merge branch 'development' into new-release

benzino77 · Aug 15, 2024 · f24f866 · f24f866
2 parents 200d55f + 47a6305
commit f24f866
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 16 deletions.
diff --git a/.github/workflows/build-docker-image.yaml b/.github/workflows/build-docker-image.yaml
@@ -37,23 +37,56 @@ jobs:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_ACCESS_TOKEN }}
 
+      - name: Log into registry ghcr.io
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
       - name: Extract version from package.json
         if: ${{ github.event.inputs.branch == 'master' }}
         run: echo "DOCKER_TAG=$(jq -r '.version' package.json)" >> $GITHUB_ENV
 
-      - name: Build and push production Docker image
+      - name: Extract Docker metadata (master)
+        if: ${{ github.event.inputs.branch == 'master' }}
+        id: meta_m
+        uses: docker/metadata-action@v5
+        with:
+          tags: |
+            type=raw,value=latest
+            type=raw,value=${{ env.DOCKER_TAG }}
+          images: |
+            ${{ github.repository }}
+            ghcr.io/${{ github.repository }}
+
+      - name: Extract Docker metadata (development)
+        if: ${{ github.event.inputs.branch == 'development' }}
+        id: meta_d
+        uses: docker/metadata-action@v5
+        with:
+          tags: |
+            type=raw,value=development
+          images: |
+            ${{ github.repository }}
+            ghcr.io/${{ github.repository }}
+
+      - name: Build and push production Docker image (master)
         if: ${{ github.event.inputs.branch == 'master' }}
-        run: |
-          docker buildx build \
-            --platform linux/amd64,linux/arm64,linux/arm/v7 \
-            -t benzino77/tasmocompiler:$DOCKER_TAG \
-            -t benzino77/tasmocompiler:latest \
-            -f Dockerfile --push .
-
-      - name: Build and push development Docker image
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          platforms: linux/amd64,linux/arm64,linux/arm/v7
+          push: true
+          tags: ${{ steps.meta_m.outputs.tags }}
+          labels: ${{ steps.meta_m.outputs.labels }}
+
+      - name: Build and push production Docker image (development)
         if: ${{ github.event.inputs.branch == 'development' }}
-        run: |
-          docker buildx build \
-            --platform linux/amd64,linux/arm64,linux/arm/v7 \
-            -t benzino77/tasmocompiler:development \
-            -f Dockerfile --push .
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          platforms: linux/amd64,linux/arm64,linux/arm/v7
+          push: true
+          tags: ${{ steps.meta_d.outputs.tags }}
+          labels: ${{ steps.meta_d.outputs.labels }}
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/components/AppStepper/FeaturesStep/AvailableBoards.js b/src/components/AppStepper/FeaturesStep/AvailableBoards.js
@@ -263,6 +263,8 @@ const availableBoards = [
       build_flags:
         // eslint-disable-next-line
         '${env:tasmota32_base.build_flags}',
+      // eslint-disable-next-line
+      lib_extra_dirs: ['${env:tasmota32_base.lib_extra_dirs}'],
     },
     platformio_env_name: 'tasmota32c2',
     tooltip: '',

diff --git a/src/components/AppStepper/FeaturesStep/AvailableFeatures.js b/src/components/AppStepper/FeaturesStep/AvailableFeatures.js
@@ -49,7 +49,7 @@ const availableFeatures = [
     name: 'common_displays',
     value: false,
     show: false,
-    group: ['USE_DISPLAY', 'USE_UNIVERSAL_DISPLAY', 'USE_UNIVERSAL_TOUCH', 'USE_TASMOTA_DISCOVERY'],
+    group: ['USE_DISPLAY', 'USE_UNIVERSAL_DISPLAY', 'USE_UNIVERSAL_TOUCH'],
     description: '',
     boards: ['all'],
   },