Merge branch 'development' into prerelease-13.0

arendst · Jun 26, 2023 · a435ec8 · a435ec8
2 parents 654f420 + b53a161
commit a435ec8
Showing 1 changed file with 0 additions and 61 deletions.
diff --git a/.github/workflows/Tasmota_build_master.yml b/.github/workflows/Tasmota_build_master.yml
@@ -14,67 +14,7 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  be_solidify:
-    runs-on: ubuntu-latest
-    if: github.repository == 'arendst/Tasmota' && github.ref_name == 'development'
-    continue-on-error: true
-    steps:
-      - uses: actions/checkout@v3
-      - name: Set up Python
-        uses: actions/setup-python@v4
-        with:
-          python-version: '3.x'
-      - name: Install clang compiler
-        run: |
-          sudo apt-get install -f clang
-      - name: Make Berry and Tasmota Berry code
-        run: |
-          cd lib/libesp32/berry
-          make
-          cd ../berry_tasmota
-          ../berry/berry -s -g solidify_all.be
-      - name: Matter Berry Code
-        run: |
-          cd lib/libesp32/berry_matter
-          ../berry/berry -s -g solidify_all.be
-      - name: LVGL Berry Code
-        run: |
-          cd lib/libesp32_lvgl/lv_binding_berry
-          ../../libesp32/berry/berry -s -g solidify_all.be
-      - uses: jason2866/upload-artifact@v2.0.2
-        with:
-          name: '["berry_tasmota", "berry_matter", "berry_lvgl", "berry_header"]'
-          path: '["./lib/libesp32/berry_tasmota/src/solidify", "./lib/libesp32/berry_matter/src/solidify", "./lib/libesp32_lvgl/lv_binding_berry/src/solidify", "./lib/libesp32/berry/generate"]'
-
-  push_solidified:
-    needs: be_solidify
-    runs-on: ubuntu-latest
-    if: github.repository == 'arendst/Tasmota' && github.ref_name == 'development'
-    continue-on-error: true
-    steps:
-      - uses: actions/checkout@v3
-      - name: Set up Python
-        uses: actions/setup-python@v4
-        with:
-          python-version: '3.x'
-      - uses: jason2866/download-artifact@v3
-        with:
-          name: |
-            berry_tasmota
-            berry_matter
-            berry_lvgl
-            berry_header
-          path: |
-            ./lib/libesp32/berry_tasmota/src/solidify
-            ./lib/libesp32/berry_matter/src/solidify
-            ./lib/libesp32_lvgl/lv_binding_berry/src/solidify
-            ./lib/libesp32/berry/generate
-      - uses: stefanzweifel/git-auto-commit-action@v4
-        with:
-          commit_message: Solidified Code updated
-
   safeboot-images:
-    needs: push_solidified
     runs-on: ubuntu-latest
     if: github.repository == 'arendst/Tasmota'
     continue-on-error: true
@@ -110,7 +50,6 @@ jobs:
           path: ./build_output
 
   base-images:
-    needs: push_solidified
     runs-on: ubuntu-latest
     if: github.repository == 'arendst/Tasmota'
     continue-on-error: true