Skip to content

Commit

Permalink
Remove dist folder from repo (evcc-io#5862)
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
andig authored Jan 21, 2023
1 parent e7d89fa commit 2614b96
Show file tree
Hide file tree
Showing 24 changed files with 44 additions and 232 deletions.
25 changes: 14 additions & 11 deletions .github/workflows/default.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -81,6 +75,8 @@ jobs:
cache: true
id: go

- run: mkdir dist && touch dist/empty

- name: Lint
uses: golangci/golangci-lint-action@v3
with:
Expand Down Expand Up @@ -115,9 +111,6 @@ jobs:
- name: Install tools
run: make install-ui

- name: Build
run: make ui

- name: Lint
run: make lint-ui

Expand All @@ -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 changes: 18 additions & 1 deletion .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -59,7 +68,6 @@ jobs:
platforms: linux/amd64,linux/arm64,linux/arm/v6
push: true
tags: |
andig/evcc:nightly
evcc/evcc:nightly
apt:
Expand All @@ -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:
Expand Down
10 changes: 9 additions & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ jobs:
uses: docker/metadata-action@v4
with:
images: |
andig/evcc
evcc/evcc
- name: Publish
Expand Down Expand Up @@ -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: |
Expand Down
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ evcc.exe
evcc_*
linux-*.Dockerfile
builddir
dist
flags
node_modules
release
Expand All @@ -30,4 +31,4 @@ fly.toml
.idea
vendor/*
QEMU_EFI.fd
asset-stats.html
asset-stats.html
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Binary file removed dist/assets/Montserrat-Bold.294653dc.woff2
Binary file not shown.
Binary file removed dist/assets/Montserrat-Medium.f8c1310c.woff2
Binary file not shown.
116 changes: 0 additions & 116 deletions dist/assets/index.724774dd.js

This file was deleted.

6 changes: 0 additions & 6 deletions dist/assets/index.bbc121e2.css

This file was deleted.

39 changes: 0 additions & 39 deletions dist/index.html

This file was deleted.

Binary file removed dist/meta/android-chrome-192x192.png
Binary file not shown.
Binary file removed dist/meta/android-chrome-512x512.png
Binary file not shown.
Binary file removed dist/meta/apple-touch-icon.png
Binary file not shown.
11 changes: 0 additions & 11 deletions dist/meta/browserconfig.xml

This file was deleted.

Binary file removed dist/meta/favicon-16x16.png
Binary file not shown.
Binary file removed dist/meta/favicon-32x32.png
Binary file not shown.
Binary file removed dist/meta/favicon.ico
Binary file not shown.
Binary file removed dist/meta/mstile-144x144.png
Binary file not shown.
Binary file removed dist/meta/mstile-150x150.png
Binary file not shown.
Binary file removed dist/meta/mstile-310x150.png
Binary file not shown.
Binary file removed dist/meta/mstile-310x310.png
Binary file not shown.
Binary file removed dist/meta/mstile-70x70.png
Binary file not shown.
25 changes: 0 additions & 25 deletions dist/meta/safari-pinned-tab.svg

This file was deleted.

20 changes: 0 additions & 20 deletions dist/meta/site.webmanifest

This file was deleted.

0 comments on commit 2614b96

Please sign in to comment.