Stefan/evcc-io
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove dist folder from repo (#5862)

Browse source 
This PR removes the dist folder from the repo. With omitting dist, we will see much less merge conflicts and reduce the barriers for new contributors. This should not impact build speed as we're using actions/cache to re-use the built ui artefacts across jobs.
This commit is contained in:
andig 2023-01-21 12:42:36 +01:00 • committed by GitHub
parent e7d89fa595
commit 2614b96785
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
24 changed files with 44 additions and 232 deletions
Download patch file Download diff file Expand all files Collapse all files

25
.github/workflows/default.yml vendored
View file

@ -43,11 +43,8 @@ jobs:
cache: true
id: go
- name: Patch ASN1
run: make patch-asn1-sudo
- name: Build
run: make build
run: mkdir dist && touch dist/empty && make build
test:
name: Test
@ -62,11 +59,8 @@ jobs:
cache: true
id: go
- name: Patch ASN1
run: make patch-asn1-sudo
- name: Test
run: make test
run: mkdir dist && touch dist/empty && make test
lint:
name: Lint
@ -81,6 +75,8 @@ jobs:
cache: true
id: go
- run: mkdir dist && touch dist/empty
- name: Lint
uses: golangci/golangci-lint-action@v3
with:
@ -115,9 +111,6 @@ jobs:
- name: Install tools
run: make install-ui
- name: Build
run: make ui
- name: Lint
run: make lint-ui
@ -127,3 +120,13 @@ jobs:
- name: Porcelain
run: |
test -z "$(git status --porcelain)" || (git status; git diff; false)
- name: Build
run: make ui
- name: Cache dist
uses: actions/cache@v3
id: cache-dist
with:
path: dist
key: ${{ runner.os }}-dist

19
.github/workflows/nightly.yml vendored
View file

@ -43,6 +43,15 @@ jobs:
ref: refs/heads/master # force master
fetch-depth: 0
- run: ls
- name: Get dist from cache
uses: actions/cache@v3
id: cache-dist
with:
path: dist
key: ${{ runner.os }}-dist
- run: ls dist
- name: Login
uses: docker/login-action@v2
with:
@ -59,7 +68,6 @@ jobs:
platforms: linux/amd64,linux/arm64,linux/arm/v6
push: true
tags: |
andig/evcc:nightly
evcc/evcc:nightly
apt:
@ -85,6 +93,15 @@ jobs:
- name: Patch ASN1
run: make patch-asn1-sudo
- run: ls
- name: Get dist from cache
uses: actions/cache@v3
id: cache-dist
with:
path: dist
key: ${{ runner.os }}-dist
- run: ls dist
- name: Create nightly build
uses: goreleaser/goreleaser-action@v4
with:

10
.github/workflows/release.yml vendored
View file

@ -35,7 +35,6 @@ jobs:
uses: docker/metadata-action@v4
with:
images: |
andig/evcc
evcc/evcc
- name: Publish
@ -71,6 +70,15 @@ jobs:
- name: Patch ASN1
run: make patch-asn1-sudo
- run: ls
- name: Get dist from cache
uses: actions/cache@v3
id: cache-dist
with:
path: dist
key: ${{ runner.os }}-dist
- run: ls dist
# gokrazy image
# - name: Prepare Image
# run: |

3
.gitignore vendored
View file

@ -17,6 +17,7 @@ evcc.exe
evcc_*
linux-*.Dockerfile
builddir
dist
flags
node_modules
release
@ -30,4 +31,4 @@ fly.toml
.idea
vendor/*
QEMU_EFI.fd
asset-stats.html
asset-stats.html

2
Makefile
View file

@ -13,7 +13,7 @@ LD_FLAGS := -X github.com/evcc-io/evcc/server.Version=$(VERSION) -X github.com/e
BUILD_ARGS := -ldflags='$(LD_FLAGS)'
# docker
DOCKER_IMAGE := andig/evcc
DOCKER_IMAGE := evcc/evcc
PLATFORM := linux/amd64,linux/arm64,linux/arm/v6
# gokrazy image

BIN
dist/assets/Montserrat-Bold.294653dc.woff2 vendored
View file

Binary file not shown.

BIN
dist/assets/Montserrat-Medium.f8c1310c.woff2 vendored
View file

Binary file not shown.

116
dist/assets/index.724774dd.js vendored
View file

File diff suppressed because one or more lines are too long

6
dist/assets/index.bbc121e2.css vendored
View file

File diff suppressed because one or more lines are too long

39
dist/index.html vendored
View file

@ -1,39 +0,0 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="description" content="evcc - Sonne tanken ☀️🚘" />
<meta name="apple-mobile-web-app-capable" content="yes" />
<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
<meta name="apple-mobile-web-app-title" content="evcc" />
<meta name="application-name" content="evcc" />
<link rel="apple-touch-icon" sizes="180x180" href="meta/apple-touch-icon.png?[[.Version]]" />
<link rel="icon" type="image/png" sizes="32x32" href="meta/favicon-32x32.png?[[.Version]]" />
<link rel="icon" type="image/png" sizes="16x16" href="meta/favicon-16x16.png?[[.Version]]" />
<link rel="manifest" href="meta/site.webmanifest?[[.Version]]" crossorigin="use-credentials" />
<link rel="mask-icon" href="meta/safari-pinned-tab.svg?[[.Version]]" color="#28293e" />
<link rel="shortcut icon" href="meta/favicon.ico?[[.Version]]" />
<meta name="msapplication-TileColor" content="#28293e" />
<meta name="msapplication-config" content="meta/browserconfig.xml?[[.Version]]" />
<meta name="theme-color" content="#020318" />
<title>evcc</title>
<script type="module" crossorigin src="./assets/index.724774dd.js"></script>
<link rel="stylesheet" href="./assets/index.bbc121e2.css">
</head>
<body>
<script>
window.evcc = {
version: "[[.Version]]",
configured: "[[.Configured]]",
commit: "[[.Commit]]",
};
</script>
<div id="app"></div>
</body>
</html>

BIN
dist/meta/android-chrome-192x192.png vendored
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1.9 KiB

BIN
dist/meta/android-chrome-512x512.png vendored
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 4 KiB

BIN
dist/meta/apple-touch-icon.png vendored
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1.7 KiB

11
dist/meta/browserconfig.xml vendored
View file

@ -1,11 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<browserconfig>
<msapplication>
<tile>
<square70x70logo src="meta/mstile-70x70.png" />
<square150x150logo src="meta/mstile-150x150.png" />
<square310x310logo src="meta/mstile-310x310.png" />
<TileColor>#18191a</TileColor>
</tile>
</msapplication>
</browserconfig>

BIN
dist/meta/favicon-16x16.png vendored
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 646 B

BIN
dist/meta/favicon-32x32.png vendored
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 797 B

BIN
dist/meta/favicon.ico vendored
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 15 KiB

BIN
dist/meta/mstile-144x144.png vendored
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1.7 KiB

BIN
dist/meta/mstile-150x150.png vendored
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1.7 KiB

BIN
dist/meta/mstile-310x150.png vendored
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1.8 KiB

BIN
dist/meta/mstile-310x310.png vendored
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 2.8 KiB

BIN
dist/meta/mstile-70x70.png vendored
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1.3 KiB

25
dist/meta/safari-pinned-tab.svg vendored
View file

@ -1,25 +0,0 @@
<?xml version="1.0" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
"http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
width="700.000000pt" height="700.000000pt" viewBox="0 0 700.000000 700.000000"
preserveAspectRatio="xMidYMid meet">
<g transform="translate(0.000000,700.000000) scale(0.100000,-0.100000)"
fill="#000000" stroke="none">
<path d="M3369 5835 c-9 -22 -214 -512 -454 -1090 -240 -577 -488 -1173 -551
-1323 -63 -151 -114 -278 -114 -283 0 -5 241 -8 566 -6 l566 2 -6 -62 c-3 -35
-10 -84 -16 -110 -5 -27 -12 -68 -15 -93 -3 -25 -8 -61 -11 -80 -4 -29 -24
-157 -39 -250 -2 -14 -7 -45 -10 -70 -3 -25 -8 -56 -10 -70 -17 -106 -35 -222
-39 -255 -8 -53 -17 -115 -22 -140 -2 -11 -6 -42 -9 -70 -3 -27 -8 -57 -10
-65 -2 -8 -7 -35 -10 -60 -3 -25 -8 -56 -11 -70 -2 -14 -6 -38 -8 -55 -2 -16
-7 -46 -10 -65 -3 -19 -8 -51 -11 -70 -2 -19 -6 -44 -9 -55 -2 -11 -7 -47 -12
-80 -4 -33 -8 -62 -9 -65 -1 -3 -5 -30 -9 -60 -5 -30 -10 -62 -11 -70 -2 -8
-6 -37 -9 -65 -4 -27 -9 -57 -11 -65 -2 -8 -6 -35 -9 -60 -4 -25 -10 -69 -15
-97 -4 -29 -5 -53 -1 -53 4 0 17 19 29 43 11 23 43 85 72 137 69 128 330 614
386 720 25 47 53 99 63 115 9 17 41 75 70 130 92 172 106 198 142 265 19 36
54 101 78 145 128 239 190 355 212 395 14 25 46 86 73 135 61 115 121 226 155
290 15 28 49 91 75 140 26 50 59 110 73 135 26 47 65 121 137 255 23 44 63
119 89 166 25 48 46 89 46 93 0 3 -204 6 -453 6 l-453 0 453 906 c250 499 451
909 448 913 -4 3 -311 6 -682 6 l-676 1 -18 -41z"/>
</g>
</svg>
Side by side

Before

Width:  |  Height:  |  Size: 1.5 KiB

20
dist/meta/site.webmanifest vendored
View file

@ -1,20 +0,0 @@
{
"start_url": "../",
"name": "evcc",
"short_name": "evcc",
"theme_color": "#18191a",
"background_color": "#18191a",
"display": "standalone",
"icons": [
{
"src": "android-chrome-192x192.png",
"sizes": "192x192",
"type": "image/png"
},
{
"src": "android-chrome-512x512.png",
"sizes": "512x512",
"type": "image/png"
}
]
}