mirror of
https://github.com/esphome/esphome.git
synced 2024-11-23 23:48:11 +01:00
Rename master branch to release (#1976)
This commit is contained in:
parent
36861595f1
commit
d5278351da
6 changed files with 6 additions and 6 deletions
2
.github/workflows/ci-docker.yml
vendored
2
.github/workflows/ci-docker.yml
vendored
|
@ -3,7 +3,7 @@ name: CI for docker images
|
||||||
# Only run when docker paths change
|
# Only run when docker paths change
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
branches: [dev, beta, master]
|
branches: [dev, beta, release]
|
||||||
paths:
|
paths:
|
||||||
- 'docker/**'
|
- 'docker/**'
|
||||||
- '.github/workflows/**'
|
- '.github/workflows/**'
|
||||||
|
|
2
.github/workflows/ci.yml
vendored
2
.github/workflows/ci.yml
vendored
|
@ -6,7 +6,7 @@ on:
|
||||||
push:
|
push:
|
||||||
# On dev branch release-dev already performs CI checks
|
# On dev branch release-dev already performs CI checks
|
||||||
# On other branches the `pull_request` trigger will be used
|
# On other branches the `pull_request` trigger will be used
|
||||||
branches: [beta, master]
|
branches: [beta, release]
|
||||||
|
|
||||||
pull_request:
|
pull_request:
|
||||||
|
|
||||||
|
|
2
.github/workflows/release.yml
vendored
2
.github/workflows/release.yml
vendored
|
@ -307,4 +307,4 @@ jobs:
|
||||||
-X POST \
|
-X POST \
|
||||||
-H "Accept: application/vnd.github.v3+json" \
|
-H "Accept: application/vnd.github.v3+json" \
|
||||||
https://api.github.com/repos/esphome/hassio/actions/workflows/bump-version.yml/dispatches \
|
https://api.github.com/repos/esphome/hassio/actions/workflows/bump-version.yml/dispatches \
|
||||||
-d "{\"ref\":\"master\",\"inputs\":{\"version\":\"$TAG\"}}"
|
-d "{\"ref\":\"main\",\"inputs\":{\"version\":\"$TAG\"}}"
|
||||||
|
|
|
@ -23,5 +23,5 @@ repos:
|
||||||
- id: no-commit-to-branch
|
- id: no-commit-to-branch
|
||||||
args:
|
args:
|
||||||
- --branch=dev
|
- --branch=dev
|
||||||
- --branch=master
|
- --branch=release
|
||||||
- --branch=beta
|
- --branch=beta
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
# ESPHome [![Build Status](https://travis-ci.org/esphome/esphome.svg?branch=master)](https://travis-ci.org/esphome/esphome) [![Discord Chat](https://img.shields.io/discord/429907082951524364.svg)](https://discord.gg/KhAMKrd) [![GitHub release](https://img.shields.io/github/release/esphome/esphome.svg)](https://GitHub.com/esphome/esphome/releases/)
|
# ESPHome [![Discord Chat](https://img.shields.io/discord/429907082951524364.svg)](https://discord.gg/KhAMKrd) [![GitHub release](https://img.shields.io/github/release/esphome/esphome.svg)](https://GitHub.com/esphome/esphome/releases/)
|
||||||
|
|
||||||
[![ESPHome Logo](https://esphome.io/_images/logo-text.png)](https://esphome.io/)
|
[![ESPHome Logo](https://esphome.io/_images/logo-text.png)](https://esphome.io/)
|
||||||
|
|
||||||
|
|
|
@ -77,7 +77,7 @@ PLATFORMIO_ESP8266_LUT = {
|
||||||
# recommended version as otherwise a bunch of devices could be bricked
|
# recommended version as otherwise a bunch of devices could be bricked
|
||||||
# * The docker images need to be updated to ship the new recommended version, in order not
|
# * The docker images need to be updated to ship the new recommended version, in order not
|
||||||
# to DDoS platformio servers.
|
# to DDoS platformio servers.
|
||||||
# Update this file: https://github.com/esphome/esphome-docker-base/blob/master/platformio.ini
|
# Update this file: https://github.com/esphome/esphome-docker-base/blob/main/platformio.ini
|
||||||
"RECOMMENDED": ARDUINO_VERSION_ESP8266["2.7.4"],
|
"RECOMMENDED": ARDUINO_VERSION_ESP8266["2.7.4"],
|
||||||
"LATEST": "espressif8266",
|
"LATEST": "espressif8266",
|
||||||
"DEV": ARDUINO_VERSION_ESP8266["dev"],
|
"DEV": ARDUINO_VERSION_ESP8266["dev"],
|
||||||
|
|
Loading…
Reference in a new issue