diff --git a/.github/workflows/Tasmota_build_master.yml b/.github/workflows/Tasmota_build_master.yml index 47c450e02..c3d6eb775 100644 --- a/.github/workflows/Tasmota_build_master.yml +++ b/.github/workflows/Tasmota_build_master.yml @@ -1,7 +1,7 @@ name: Build_firmware_master on: - workflow_dispatch: # Manually start a workflow + workflow_dispatch: # Start a workflow push: branches: master paths-ignore: @@ -14,7 +14,67 @@ concurrency: cancel-in-progress: true jobs: + be_solidify: + runs-on: ubuntu-latest + if: github.repository == 'arendst/Tasmota' + 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' + 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 @@ -50,6 +110,7 @@ jobs: path: ./build_output base-images: + needs: push_solidified runs-on: ubuntu-latest if: github.repository == 'arendst/Tasmota' continue-on-error: true @@ -174,7 +235,7 @@ jobs: name: firmware path: ./build_output - Upload: + Release: needs: [base-images, base32-images, language-images] runs-on: ubuntu-latest continue-on-error: true @@ -192,79 +253,27 @@ jobs: path: ./mv_firmware - name: Display structure of downloaded files run: ls -R ./mv_firmware/ + - name: Zip all map.gz files in one file -> map_all.zip + run: 7z a -mx=9 -tzip -xr'!.*' map_all.zip mv_firmware/map - name: Release uses: jason2866/action-gh-release@v1.2 #if: startsWith(github.ref, 'refs/tags/') with: tag_name: ${{ github.run_number }} - files: ./mv_firmware/firmware/* + files: | + ./mv_firmware/firmware/* + map_all.zip env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - name: Move firmware files in sub-folders - run: | - mkdir -p ./release-firmware/tasmota/languages - mkdir -p ./release-firmware/tasmota32/languages - mkdir -p ./release-firmware/map - [ ! -f ./mv_firmware/map/* ] || mv ./mv_firmware/map/* ./release-firmware/map/ - [ ! -f ./mv_firmware/firmware/tasmota.* ] || mv ./mv_firmware/firmware/tasmota.* ./release-firmware/tasmota/ - [ ! -f ./mv_firmware/firmware/tasmota-4M.* ] || mv ./mv_firmware/firmware/tasmota-4M.* ./release-firmware/tasmota/ - [ ! -f ./mv_firmware/firmware/tasmota-sensors.* ] || mv ./mv_firmware/firmware/tasmota-sensors.* ./release-firmware/tasmota/ - [ ! -f ./mv_firmware/firmware/tasmota-minimal.bin.gz ] || mv ./mv_firmware/firmware/tasmota-minimal.bin.gz ./release-firmware/tasmota/ - [ ! -f ./mv_firmware/firmware/tasmota-lite.* ] || mv ./mv_firmware/firmware/tasmota-lite.* ./release-firmware/tasmota/ - [ ! -f ./mv_firmware/firmware/tasmota-ir*.* ] || mv ./mv_firmware/firmware/tasmota-ir*.* ./release-firmware/tasmota/ - [ ! -f ./mv_firmware/firmware/tasmota-display.* ] || mv ./mv_firmware/firmware/tasmota-display.* ./release-firmware/tasmota/ - [ ! -f ./mv_firmware/firmware/tasmota-knx.* ] || mv ./mv_firmware/firmware/tasmota-knx.* ./release-firmware/tasmota/ - [ ! -f ./mv_firmware/firmware/tasmota-zbbridge.* ] || mv ./mv_firmware/firmware/tasmota-zbbridge.* ./release-firmware/tasmota/ - [ ! -f ./mv_firmware/firmware/tasmota-zigbee.* ] || mv ./mv_firmware/firmware/tasmota-zigbee.* ./release-firmware/tasmota/ - [ ! -f ./mv_firmware/firmware/tasmota32.* ] || mv ./mv_firmware/firmware/tasmota32.* ./release-firmware/tasmota32/ - [ ! -f ./mv_firmware/firmware/tasmota32solo1*.* ] || mv ./mv_firmware/firmware/tasmota32solo1*.* ./release-firmware/tasmota32/ - [ ! -f ./mv_firmware/firmware/tasmota32-ir*.* ] || mv ./mv_firmware/firmware/tasmota32-ir*.* ./release-firmware/tasmota32/ - [ ! -f ./mv_firmware/firmware/tasmota32-display.* ] || mv ./mv_firmware/firmware/tasmota32-display.* ./release-firmware/tasmota32/ - [ ! -f ./mv_firmware/firmware/tasmota32-lvgl.* ] || mv ./mv_firmware/firmware/tasmota32-lvgl.* ./release-firmware/tasmota32/ - [ ! -f ./mv_firmware/firmware/tasmota32-web*.* ] || mv ./mv_firmware/firmware/tasmota32-web*.* ./release-firmware/tasmota32/ - [ ! -f ./mv_firmware/firmware/tasmota32-zbbrdgpro.* ] || mv ./mv_firmware/firmware/tasmota32-zbbrdgpro.* ./release-firmware/tasmota32/ - [ ! -f ./mv_firmware/firmware/tasmota32-nspanel.* ] || mv ./mv_firmware/firmware/tasmota32-nspanel.* ./release-firmware/tasmota32/ - [ ! -f ./mv_firmware/firmware/tasmota32-odroidgo.* ] || mv ./mv_firmware/firmware/tasmota32-odroidgo.* ./release-firmware/tasmota32/ - [ ! -f ./mv_firmware/firmware/tasmota32-core2.* ] || mv ./mv_firmware/firmware/tasmota32-core2.* ./release-firmware/tasmota32/ - [ ! -f ./mv_firmware/firmware/tasmota32-bluetooth.* ] || mv ./mv_firmware/firmware/tasmota32-bluetooth.* ./release-firmware/tasmota32/ - [ ! -f ./mv_firmware/firmware/tasmota32c3*.* ] || mv ./mv_firmware/firmware/tasmota32c3*.* ./release-firmware/tasmota32/ - [ ! -f ./mv_firmware/firmware/tasmota32s2*.* ] || mv ./mv_firmware/firmware/tasmota32s2*.* ./release-firmware/tasmota32/ - [ ! -f ./mv_firmware/firmware/tasmota32s3*.* ] || mv ./mv_firmware/firmware/tasmota32s3*.* ./release-firmware/tasmota32/ - [ ! -f ./mv_firmware/firmware/tasmota32-safeboot* ] || mv ./mv_firmware/firmware/tasmota32-safeboot* ./release-firmware/tasmota32/ - [ ! -f ./mv_firmware/firmware/tasmota32-* ] || mv ./mv_firmware/firmware/tasmota32-* ./release-firmware/tasmota32/languages/ - [ ! -f ./mv_firmware/firmware/tasmota32* ] || mv ./mv_firmware/firmware/tasmota32* ./release-firmware/tasmota32/languages/ - [ ! -f ./mv_firmware/firmware/tasmota-minimal.bin ] || rm -rf ./mv_firmware/firmware/tasmota-minimal.bin - [ ! -f ./mv_firmware/firmware/* ] || mv ./mv_firmware/firmware/* ./release-firmware/tasmota/languages/ - - name: Display files to transfer - run: ls -R ./* - - name: Push Firmware files to tmp_copy repo - uses: Jason2866/copy_file_to_another_repo_action@main - env: - API_TOKEN_GITHUB: ${{ secrets.API_TOKEN_GITHUB }} - with: - source_file: 'release-firmware' - destination_repo: 'arendst/tmp_copy' - destination_branch: 'firmware' - user_email: 'github-actions@github.com' - user_name: 'github-actions' - Start_final_copy: - needs: Upload + needs: Release runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - name: Creat trigger.txt + - name: Dispatch workflow in arendst/Tasmota-firmware run: | - echo ${GITHUB_SHA} &> trigger.txt - echo "$(