Skip to content

Commit

Permalink
Merge pull request #93 from esphome/dev
Browse files Browse the repository at this point in the history
  • Loading branch information
jesserockz authored Apr 29, 2024
2 parents 86108e0 + 7b00a2a commit 13e3314
Show file tree
Hide file tree
Showing 3 changed files with 46 additions and 5 deletions.
40 changes: 40 additions & 0 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ jobs:
name: Tag and Release
runs-on: ubuntu-latest
needs: build
outputs:
tag: ${{ steps.create_tag.outputs.tag }}
steps:
# Checkout repo, create new git tag, and git release with artifacts
- name: Checkout the repo
Expand All @@ -67,3 +69,41 @@ jobs:
name: Release ${{ steps.create_tag.outputs.tag }}
files: headers/**/*.h
generate_release_notes: true

esphome-pr:
name: Make PR into ESPHome repo
runs-on: ubuntu-latest
environment: esphome
needs:
- release
steps:
- name: Checkout esphome repo
uses: actions/[email protected]
with:
repository: esphome/esphome
ref: dev

- name: Download Artifacts
uses: actions/[email protected]
with:
path: /tmp/headers
merge-multiple: true

- name: Move headers into palce
run: |-
mv /tmp/headers/captive_portal/captive_index.h esphome/components/captive_portal/captive_index.h
mv /tmp/headers/v2/server_index_v2.h esphome/components/web_server/server_index_v2.h
mv /tmp/headers/v3/server_index_v3.h esphome/components/web_server/server_index_v3.h
- name: PR Changes
uses: peter-evans/[email protected]
with:
commit-message: "Update webserver local assets to ${{ needs.release.outputs.tag }}"
committer: esphomebot <[email protected]>
author: esphomebot <[email protected]>
branch: sync/webserver-assets
delete-branch: true
title: "Update webserver local assets to ${{ needs.release.outputs.tag }}"
body-path: .github/PULL_REQUEST_TEMPLATE.md
token: ${{ secrets.ESPHOME_WEBSERVER_SYNC_TOKEN }}
assignees: "@esphome/core"
4 changes: 2 additions & 2 deletions packages/v2/src/esp-entity-table.ts
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,7 @@ class ActionRenderer {
type="${type}"
name="${entity.unique_id}"
id="${entity.unique_id}"
value="${value}"
.value="${value}"
@change="${(e: Event) => {
const val = (<HTMLTextAreaElement>e.target)?.value;
this.actioner?.restAction(
Expand Down Expand Up @@ -326,7 +326,7 @@ class ActionRenderer {
minlength="${min || Math.min(0, value as number)}"
maxlength="${max || Math.max(255, value as number)}"
pattern="${pattern || ''}"
value="${value!}"
.value="${value!}"
@change="${(e: Event) => {
let val = e.target?.value;
this.actioner?.restAction(entity, `${action}?${opt}=${encodeURIComponent(val)}`);
Expand Down
7 changes: 4 additions & 3 deletions packages/v3/src/esp-entity-table.ts
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ class ActionRenderer {
type="${type}"
name="${entity.unique_id}"
id="${entity.unique_id}"
value="${value}"
.value="${value}"
@change="${(e: Event) => {
const val = (<HTMLTextAreaElement>e.target)?.value;
this.actioner?.restAction(
Expand Down Expand Up @@ -378,7 +378,7 @@ class ActionRenderer {
step="${step}"
min="${min}"
max="${max}"
value="${value}"
.value="${value}"
@state="${(e: CustomEvent) => {
const val = (<HTMLTextAreaElement>e.target)?.value;
this.actioner?.restAction(entity, `${action}?${opt}=${e.detail.state}`);
Expand Down Expand Up @@ -510,7 +510,8 @@ class ActionRenderer {
render_light() {
if (!this.entity) return;
return [
html`<div class="entity">
html`<div class="entity" style="
width: 100%;">
${this._switch(this.entity)}
${this.entity.brightness
? this._range(
Expand Down

0 comments on commit 13e3314

Please sign in to comment.