Skip to content

Commit cc73659

Browse files
committed
Merge remote-tracking branch 'upstream/master'
2 parents 977913b + 18247b3 commit cc73659

File tree

356 files changed

+13259
-4428
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

356 files changed

+13259
-4428
lines changed

.github/ISSUE_TEMPLATE/bug_report.yaml

+11-2
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ body:
3939
render: yaml
4040
description: >
4141
Show evcc configuration file <code>evcc.yaml</code>
42-
42+
4343
Please make sure your report does NOT contain **passwords**, **sponsor token** or other **credentials**!
44-
44+
4545
To quickly dump a redacted configuration without secrets, you can use the `evcc dump --cfg` command.
4646
4747
- type: textarea
@@ -69,6 +69,15 @@ body:
6969
- macOS
7070
- other
7171

72+
- type: checkboxes
73+
id: external
74+
attributes:
75+
label: External automation
76+
description: Make sure the observed issue is caused by evcc and not by external automation
77+
options:
78+
- label: I have made sure that no external automation like HomeAssistant or Node-RED is active or accessing any of the mentioned devices when this issue occurs.
79+
required: true
80+
7281
- type: checkboxes
7382
id: nightly
7483
attributes:

.github/workflows/default.yml

+4-14
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
name: Default
22

3-
env:
4-
GO_VERSION: ^1.23
5-
63
on:
74
push:
85
branches:
@@ -13,14 +10,13 @@ on:
1310
jobs:
1411
clean:
1512
name: Clean
16-
runs-on: ubuntu-latest
13+
runs-on: ubuntu-24.04
1714

1815
steps:
1916
- uses: actions/checkout@v4
2017

2118
- uses: actions/setup-go@v5
2219
with:
23-
go-version: ${{ env.GO_VERSION }}
2420
cache: false
2521
id: go
2622

@@ -58,7 +54,6 @@ jobs:
5854

5955
- uses: actions/setup-go@v5
6056
with:
61-
go-version: ${{ env.GO_VERSION }}
6257
cache: false
6358
id: go
6459

@@ -91,7 +86,6 @@ jobs:
9186

9287
- uses: actions/setup-go@v5
9388
with:
94-
go-version: ${{ env.GO_VERSION }}
9589
cache: false
9690
id: go
9791

@@ -117,7 +111,6 @@ jobs:
117111

118112
- uses: actions/setup-go@v5
119113
with:
120-
go-version: ${{ env.GO_VERSION }}
121114
cache: false # avoid cache thrashing
122115
id: go
123116

@@ -183,7 +176,6 @@ jobs:
183176

184177
- uses: actions/setup-go@v5
185178
with:
186-
go-version: ${{ env.GO_VERSION }}
187179
cache: false
188180
id: go
189181

@@ -208,14 +200,12 @@ jobs:
208200
- name: Build Go
209201
run: make build
210202

203+
- name: Install Playwright
204+
run: npx playwright install --with-deps chromium
205+
211206
- name: Run tests
212207
run: npx playwright test
213208

214-
# - name: Run tests
215-
# uses: docker://mcr.microsoft.com/playwright:v1.34.3-jammy
216-
# with:
217-
# args: npx playwright test
218-
219209
- uses: actions/upload-artifact@v4
220210
if: ${{ !cancelled() }}
221211
with:

.github/workflows/documentation.yml

-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
name: Deploy updated templates
22

3-
env:
4-
GO_VERSION: ^1.23
5-
63
on:
74
schedule:
85
- cron: "0 2 * * *" # same time as nightly is triggered
@@ -19,8 +16,6 @@ jobs:
1916
- uses: actions/checkout@v4
2017

2118
- uses: actions/setup-go@v5
22-
with:
23-
go-version: ${{ env.GO_VERSION }}
2419
id: go
2520

2621
- name: Build docs

.github/workflows/nightly.yml

+47-7
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
name: Nightly Build
22

3-
env:
4-
GO_VERSION: ^1.23
5-
63
on:
74
schedule: # runs on the default branch: master
85
- cron: "0 2 * * *" # run at 2 AM UTC
@@ -62,14 +59,59 @@ jobs:
6259
- name: Setup Buildx
6360
uses: docker/setup-buildx-action@v3
6461

62+
- name: Define tags
63+
id: meta
64+
uses: docker/metadata-action@v5
65+
with:
66+
images: evcc/evcc
67+
tags: |
68+
type=raw,value=nightly
69+
type=raw,value=nightly.{{date 'YYYYMMDD'}}-{{sha}}
70+
6571
- name: Publish
6672
uses: docker/build-push-action@v6
6773
with:
6874
context: .
6975
platforms: linux/amd64,linux/arm64,linux/arm/v6
7076
push: true
71-
tags: |
72-
evcc/evcc:nightly
77+
tags: ${{ steps.meta.outputs.tags }}
78+
79+
- name: Delete old nightly.* tags
80+
run: |
81+
old_tags=$(curl -s "https://hub.docker.com/v2/repositories/evcc/evcc/tags/?page_size=100" | jq -r '.results | map(select(.name | startswith("nightly."))) | sort_by(.last_updated) | reverse | .[1:] | .[].name')
82+
for tag in $old_tags; do
83+
echo "Deleting tag: $tag"
84+
curl -s -H "Authorization: Bearer ${{ secrets.DOCKER_PASS }}" -X DELETE "https://hub.docker.com/v2/repositories/evcc/evcc/tags/$tag/"
85+
done
86+
87+
hassio:
88+
name: Hassio Addon :nightly
89+
needs:
90+
- docker
91+
runs-on: ubuntu-latest
92+
93+
steps:
94+
- name: Checkout
95+
uses: actions/checkout@master
96+
with:
97+
repository: evcc-io/hassio-addon
98+
token: ${{ secrets.GH_TOKEN }}
99+
path: ./hassio
100+
101+
- name: Update version
102+
run: |
103+
current_date=$(date +%Y%m%d)
104+
short_sha=$(echo "${{ github.sha }}" | cut -c 1-7)
105+
sed -i -e "s/version:.*/version: nightly.${current_date}-${short_sha}/" ./hassio/evcc-nightly/config.yaml
106+
107+
- name: Push
108+
run: |
109+
cd ./hassio
110+
git add .
111+
git config user.name github-actions
112+
git config user.email [email protected]
113+
git commit -am "Mirror evcc nightly release"
114+
git push
73115
74116
apt:
75117
name: Publish APT nightly
@@ -83,8 +125,6 @@ jobs:
83125
fetch-depth: 0
84126

85127
- uses: actions/setup-go@v5
86-
with:
87-
go-version: ${{ env.GO_VERSION }}
88128
id: go
89129

90130
- name: Patch ASN1

.github/workflows/release.yml

-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
name: Release
22

3-
env:
4-
GO_VERSION: ^1.23
5-
63
on:
74
push:
85
tags:
@@ -63,8 +60,6 @@ jobs:
6360

6461
- name: Setup Go
6562
uses: actions/setup-go@v5
66-
with:
67-
go-version: ${{ env.GO_VERSION }}
6863
id: go
6964

7065
- name: Patch ASN1

.github/workflows/website.yml

-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
name: Deploy data to website
22

3-
env:
4-
GO_VERSION: ^1.23
5-
63
on:
74
release:
85
types: [created]
@@ -17,8 +14,6 @@ jobs:
1714
- uses: actions/checkout@v4
1815

1916
- uses: actions/setup-go@v5
20-
with:
21-
go-version: ${{ env.GO_VERSION }}
2217
id: go
2318

2419
- name: Build docs

.golangci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
run:
2-
go: "1.23"
2+
go: "1.24"
33

44
issues:
55
exclude:

.goreleaser-nightly.yml

-8
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,6 @@ builds:
3333
flags:
3434
- -trimpath
3535
- -tags=release,timetzdata
36-
- goos: darwin
37-
goarch: arm64
38-
ldflags:
39-
- -X github.com/evcc-io/evcc/server.Version={{ .Tag }} -X github.com/evcc-io/evcc/server.Commit={{ .ShortCommit }} -s -w -B gobuildid
40-
- goos: darwin
41-
goarch: amd64
42-
ldflags:
43-
- -X github.com/evcc-io/evcc/server.Version={{ .Tag }} -X github.com/evcc-io/evcc/server.Commit={{ .ShortCommit }} -s -w -B gobuildid
4436

4537
archives:
4638
- builds:

.goreleaser.yml

-8
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,6 @@ builds:
3838
flags:
3939
- -trimpath
4040
- -tags=release,timetzdata
41-
- goos: darwin
42-
goarch: arm64
43-
ldflags:
44-
- -X github.com/evcc-io/evcc/server.Version={{ .Version }} -s -w -B gobuildid
45-
- goos: darwin
46-
goarch: amd64
47-
ldflags:
48-
- -X github.com/evcc-io/evcc/server.Version={{ .Version }} -s -w -B gobuildid
4941

5042
env:
5143
- CGO_ENABLED=0

CONTRIBUTING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
#### Development environment
66

7-
Developing evcc requires [Go][1] 1.23 and [Node][2] 22. We recommend VSCode with the [Go](https://marketplace.visualstudio.com/items?itemName=golang.Go), [Prettier](https://marketplace.visualstudio.com/items?itemName=esbenp.prettier-vscode) and [Vetur](https://marketplace.visualstudio.com/items?itemName=octref.vetur) extensions.
7+
Developing evcc requires [Go][1] and [Node][2]. We recommend VSCode with the [Go](https://marketplace.visualstudio.com/items?itemName=golang.Go), [Prettier](https://marketplace.visualstudio.com/items?itemName=esbenp.prettier-vscode) and [Vetur](https://marketplace.visualstudio.com/items?itemName=octref.vetur) extensions.
88

99
Alternatively, if you use VS Code and [devcontainers](https://code.visualstudio.com/docs/devcontainers/containers), you can use the "Dev containers: Clone repository in container volume" action. This will create a devcontainer with the required toolchain and install the prerequisites as explained below. Wait until the startup log says "Done. Press any key to close the terminal." and check for any errors.
1010

Dockerfile

+1-5
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ RUN make ui
2020

2121

2222
# STEP 2 build executable binary
23-
FROM --platform=$BUILDPLATFORM golang:1.23-alpine AS builder
23+
FROM --platform=$BUILDPLATFORM golang:1.24-alpine AS builder
2424

2525
# Install git + SSL ca certificates.
2626
# Git is required for fetching the dependencies.
@@ -39,7 +39,6 @@ RUN go mod download
3939

4040
# install tools
4141
COPY Makefile .
42-
COPY tools.go .
4342
COPY cmd/decorate/ cmd/decorate/
4443
COPY api/ api/
4544
RUN make install
@@ -58,9 +57,6 @@ ARG TARGETARCH
5857
ARG TARGETVARIANT
5958
ARG GOARM=${TARGETVARIANT#v}
6059

61-
ARG TESLA_CLIENT_ID
62-
ENV TESLA_CLIENT_ID=${TESLA_CLIENT_ID}
63-
6460
RUN RELEASE=${RELEASE} GOOS=${TARGETOS} GOARCH=${TARGETARCH} GOARM=${GOARM} make build
6561

6662

0 commit comments

Comments
 (0)