Skip to content
This repository has been archived by the owner on Oct 4, 2021. It is now read-only.

Commit

Permalink
prepare rename of branch
Browse files Browse the repository at this point in the history
  • Loading branch information
proddy committed Feb 6, 2021
1 parent 36f0555 commit 8409e8b
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 57 deletions.
7 changes: 3 additions & 4 deletions .github/workflows/build_firmware.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
name: Build Firmware
name: Build ESP8266 Dev Firmware

on:
push:
branches:
- dev
- esp8266_dev
tags:
# - '*.*.*'
paths:
- 'CHANGELOG_LATEST.md'
workflow_dispatch:
branches: [ dev ]
branches: [ esp8266_dev ]

jobs:

Expand Down Expand Up @@ -44,7 +44,6 @@ jobs:
- name: Build images
run: |
platformio run -e esp8266-ci
platformio run -e esp32-ci
- name: Delete
uses: dev-drprasad/delete-tag-and-release@v0.1.2
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/release_main.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
name: Release Main
name: Release Stable ESP8266

on:
workflow_dispatch:
branches: [ main ]
branches: [ stable_esp8266 ]

jobs:

Expand Down Expand Up @@ -37,7 +37,6 @@ jobs:
- name: Build images
run: |
platformio run -e esp8266-ci
platformio run -e esp32-ci
- name: Changelog
run: cat RELEASENOTES.md CHANGELOG_LATEST.md > BODY.txt
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/standalone_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Standalone Build

on:
push:
branches: [ dev ]
branches: [ dev_esp8266 ]
paths:
- 'src/**'

Expand Down
2 changes: 1 addition & 1 deletion RELEASENOTES_DEV.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# ![logo](https://github.com/proddy/EMS-ESP/blob/main/media/EMS-ESP_logo_dark.png)

This is a snapshot of the current "beta" development code and firmware binaries using the `dev` branch. It has all the latest features and fixes but please be aware that this is still experimental firmware used for testing and thus may contain the odd bug. Use at your own risk and remember to report an issue if you find something unusual.
This is a snapshot of the current "beta" development code and firmware binaries for the ESP8266. It has all the latest features and fixes but please be aware that this is still experimental firmware used for testing and thus may contain the odd bug. Use at your own risk and remember to report an issue if you find something unusual.

# Firmware Installation

Expand Down
28 changes: 0 additions & 28 deletions debug_esp32_pio_local.ini

This file was deleted.

File renamed without changes.
20 changes: 0 additions & 20 deletions platformio.ini
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

[platformio]
default_envs = esp8266
; default_envs = esp32

# override any settings with your own local ones in pio_local.ini
extra_configs =
Expand Down Expand Up @@ -56,15 +55,6 @@ board_build.filesystem = littlefs
board_build.f_cpu = 160000000L
build_flags = ${common.build_flags}

; build for GitHub Actions CI
[env:esp32-ci]
extra_scripts =
scripts/rename_fw.py
board = esp32dev
platform = espressif32
board_build.partitions = min_spiffs.csv
build_flags = ${common.build_flags}

[env:esp8266]
extra_scripts =
pre:scripts/build_interface.py
Expand All @@ -80,13 +70,3 @@ board_build.f_cpu = 160000000L ; 160MHz
build_flags = ${common.build_flags} ${common.debug_flags}
lib_ignore =
AsyncTCP

[env:esp32]
extra_scripts =
pre:scripts/build_interface.py
scripts/rename_fw.py
board = esp32dev
platform = espressif32
; platform = https://github.com/platformio/platform-espressif32.git
board_build.partitions = min_spiffs.csv ; https://github.com/espressif/arduino-esp32/blob/master/tools/partitions/
build_flags = ${common.build_flags} ${common.debug_flags}

0 comments on commit 8409e8b

Please sign in to comment.