diff --git a/.github/workflows/Tasmota_build.yml b/.github/workflows/Tasmota_build_development.yml similarity index 92% rename from .github/workflows/Tasmota_build.yml rename to .github/workflows/Tasmota_build_development.yml index fd2c6fe05..73523b124 100644 --- a/.github/workflows/Tasmota_build.yml +++ b/.github/workflows/Tasmota_build_development.yml @@ -1,4 +1,4 @@ -name: Build_firmware +name: Build_firmware_development on: workflow_dispatch: # Manually start a workflow @@ -25,7 +25,6 @@ jobs: with: github_token: ${{ secrets.GITHUB_TOKEN }} branch: 'development' - force: true tasmota: @@ -1393,13 +1392,6 @@ jobs: runs-on: ubuntu-latest continue-on-error: true steps: - - uses: actions/checkout@v2 - with: - ref: firmware - - name: Display files from branch firmware - run: ls -R - - name: Remove old firmware files - run: rm -rf ./firmware/* - uses: actions/download-artifact@v2 with: name: firmware @@ -1411,8 +1403,6 @@ jobs: run: | mkdir -p ./firmware/tasmota/languages mkdir -p ./firmware/tasmota32/languages - mkdir -p ./firmware/tasmota32/ESP32_needed_files/ - mkdir -p ./firmware/tasmota32/Odroid_go_and_core2_needed_files/ mkdir -p ./firmware/map [ ! -f ./mv_firmware/map/* ] || mv ./mv_firmware/map/* ./firmware/map/ [ ! -f ./mv_firmware/firmware/tasmota.* ] || mv ./mv_firmware/firmware/tasmota.* ./firmware/tasmota/ @@ -1435,31 +1425,14 @@ jobs: [ ! -f ./mv_firmware/firmware/tasmota32-bluetooth.* ] || mv ./mv_firmware/firmware/tasmota32-bluetooth.* ./firmware/tasmota32/ [ ! -f ./mv_firmware/firmware/tasmota32* ] || mv ./mv_firmware/firmware/tasmota32* ./firmware/tasmota32/languages/ [ ! -f ./mv_firmware/firmware/* ] || mv ./mv_firmware/firmware/* ./firmware/tasmota/languages/ - [ ! -f ./tools/Esptool/ESP32/*.* ] || mv ./tools/Esptool/ESP32/*.* ./firmware/tasmota32/ESP32_needed_files/ - [ ! -f ./tools/Esptool/Odroid_go_and_core2/*.* ] || mv ./tools/Esptool/Odroid_go_and_core2/*.* ./firmware/tasmota32/Odroid_go_and_core2_needed_files/ - [ ! -f ./FIRMWARE.md ] || mv -f ./FIRMWARE.md ./README.md - - uses: actions/checkout@v2 - with: - ref: release-firmware - path: tmp-folder - - name: Display files from branch release-firmware - run: | - ls -R ./tmp-folder - mkdir -p ./release-firmware/ - cp -rf ./tmp-folder/firmware/* ./release-firmware/ - rm -rf ./tmp-folder - - name: Display files to commit + - name: Display files to transfer run: ls -R ./* - - name: Commit files # transfer the new binaries back into the repository - run: | - git config user.name github-actions - git config user.email github-actions@github.com - git rm -r --cached . - git add -f ./* - git commit -m "Tasmota ESP Binaries http://tasmota.com" - - name: Push changes # push the firmware files to branch firmware - uses: ad-m/github-push-action@master + - name: Push Firmware files to https://github.com/arendst/Tasmota-firmware + uses: dmnemec/copy_file_to_another_repo_action@main + env: + API_TOKEN_GITHUB: ${{ secrets.API_TOKEN_GITHUB }} with: - github_token: ${{ secrets.GITHUB_TOKEN }} - branch: 'firmware' - force: true + source_file: 'firmware' + destination_repo: 'arendst/Tasmota-firmware' + user_email: 'github-actions@github.com' + user_name: 'github-actions'