Skip to content

Commit e47bb2b

Browse files
committed
Upgrade release tools
1 parent 3bb58e5 commit e47bb2b

File tree

7 files changed

+17
-8
lines changed

7 files changed

+17
-8
lines changed

.dockerignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
Dockerfile
1010
dist
1111
node_modules
12+
release
1213
!entrypoint.sh
1314
!evcc.dist.yaml
1415
!package*.json

.github/workflows/build.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
- name: Install tools
3333
run: make install
3434

35-
- name: Assets & UI
35+
- name: Assets
3636
run: make assets
3737

3838
- name: Porcelain
@@ -46,7 +46,7 @@ jobs:
4646
- name: Lint
4747
uses: golangci/golangci-lint-action@v2
4848
with:
49-
version: v1.33
49+
version: v1.37
5050

5151
- name: Test
5252
run: make test
@@ -70,9 +70,12 @@ jobs:
7070
- name: Install tools
7171
run: make install-ui
7272

73-
- name: Assets & UI
73+
- name: Build
7474
run: make ui
7575

76+
- name: Lint
77+
run: make lint-ui
78+
7679
- name: Porcelain
7780
run: |
7881
test -z "$(git status --porcelain)" || (git status; git diff; false)
@@ -160,7 +163,7 @@ jobs:
160163
- name: Set up Go
161164
uses: actions/setup-go@v2
162165
with:
163-
go-version: ^1.14
166+
go-version: ^1.16
164167
id: go
165168

166169
- name: Prepare Image

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,4 @@ flags/*
1414
buildflags/*
1515
linux-*.Dockerfile
1616
node_modules
17+
release

.goreleaser.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
dist: release
12
release:
23
github:
34
owner: andig
@@ -28,8 +29,6 @@ archives:
2829
- builds:
2930
- evcc
3031
replacements:
31-
amd64: 64-bit
32-
386: 32-bit
3332
darwin: macOS
3433
format: tar.gz
3534
format_overrides:

Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ RUN make install-ui
1313
# build ui
1414
COPY assets assets
1515
COPY vue.config.js vue.config.js
16+
COPY .eslintrc.js .eslintrc.js
1617
RUN make clean ui
1718

1819

Makefile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.PHONY: default all clean install install-ui ui assets lint test build test-release release
1+
.PHONY: default all clean install install-ui ui assets lint lint-ui test build test-release release
22
.PHONY: docker publish-testing publish-latest publish-images
33
.PHONY: prepare-image image-rootfs image-update
44

@@ -23,7 +23,7 @@ IMAGE_OPTIONS := -hostname evcc -http_port 8080 github.com/gokrazy/serial-busybo
2323

2424
default: build
2525

26-
all: clean install install-ui ui assets lint test build
26+
all: clean install install-ui ui assets lint lint-ui test build
2727

2828
clean:
2929
rm -rf dist/
@@ -42,6 +42,8 @@ assets:
4242

4343
lint:
4444
golangci-lint run
45+
46+
lint-ui:
4547
npm run lint
4648

4749
test:
@@ -79,6 +81,7 @@ publish-images:
7981

8082
prepare-image:
8183
go get github.com/gokrazy/tools/cmd/gokr-packer@latest
84+
go get github.com/gokrazy/rpi-eeprom@latest
8285
mkdir -p flags/github.com/gokrazy/breakglass
8386
echo "-forward=private-network" > flags/github.com/gokrazy/breakglass/flags.txt
8487
mkdir -p buildflags/github.com/andig/evcc

docker/tmpl.Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ RUN make install-ui
1313
# build ui
1414
COPY assets assets
1515
COPY vue.config.js vue.config.js
16+
COPY .eslintrc.js .eslintrc.js
1617
RUN make clean ui
1718

1819

0 commit comments

Comments
 (0)