Skip to content

Commit 1a1681f

Browse files
authored
Merge pull request #410 from kinvolk/dep-up
Frontend dependency updates, CI improvements
2 parents da10da6 + a9c6195 commit 1a1681f

15 files changed

Lines changed: 794 additions & 1224 deletions

File tree

.github/workflows/backend.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,20 @@ on:
77
- 'go.mod'
88
- 'go.sum'
99
- 'updaters/**'
10+
- '.github/**'
1011

1112
jobs:
1213

1314
build:
1415
name: Lint & Build
15-
runs-on: ubuntu-18.04
16+
runs-on: ubuntu-20.04
1617

1718
steps:
1819

19-
- name: Set up Go 1.13
20+
- name: Set up Go 1.16
2021
uses: actions/setup-go@v1
2122
with:
22-
go-version: 1.13.x
23+
go-version: 1.16.x
2324
id: go
2425

2526
- name: Check out code
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: Build Container Image
2+
on:
3+
pull_request:
4+
paths:
5+
- 'backend/**'
6+
- 'frontend/**'
7+
- Makefile
8+
- '.github/**'
9+
10+
jobs:
11+
build:
12+
name: Build Container Image
13+
runs-on: ubuntu-20.04
14+
steps:
15+
- name: Check out code
16+
uses: actions/checkout@v2
17+
- name: Build image
18+
run: |
19+
cd $GITHUB_WORKSPACE
20+
make container

.github/workflows/frontend.yml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,22 @@ jobs:
2424
with:
2525
node-version: ${{ matrix.node-version }}
2626

27+
- name: Install dependencies
28+
run: |
29+
make frontend-install-ci
30+
2731
- name: Run linter
2832
run: |
29-
make frontend-install
3033
make frontend-lint
3134
3235
- name: Run test
3336
run: |
34-
make frontend-install
3537
make frontend-test
3638
3739
- name: Build Frontend
3840
run: |
39-
make frontend
41+
make frontend-build
42+
43+
- name: Run typecheck
44+
run: |
45+
make frontend-tsc

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ WORKDIR /nebraska-source
1313

1414
RUN make frontend backend-binary
1515

16-
FROM alpine:3.12.0
16+
FROM alpine:3.14.0
1717

1818
RUN apk update && \
1919
apk add ca-certificates tzdata

Makefile

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,14 @@ run-frontend:
5656
frontend-install:
5757
cd frontend && npm install
5858

59+
.PHONY: frontend-install-ci
60+
frontend-install-ci:
61+
cd frontend && npm ci
62+
63+
.PHONY: frontend-build
64+
frontend-build:
65+
cd frontend && npm run build
66+
5967
.PHONY: frontend-test
6068
frontend-test:
6169
cd frontend && npm run test
@@ -64,6 +72,10 @@ frontend-test:
6472
frontend-lint:
6573
cd frontend && npm run lint
6674

75+
.PHONY: frontend-tsc
76+
frontend-tsc:
77+
cd frontend && npm run tsc
78+
6779
.PHONY: i18n
6880
i18n:
6981
cd frontend && npm run i18n

0 commit comments

Comments
 (0)