From 62f63d4af74ba83841cbdfadc0f29b4482f950b0 Mon Sep 17 00:00:00 2001 From: boojack Date: Sat, 19 Nov 2022 14:51:28 +0800 Subject: [PATCH] chore: update dependencies version (#491) --- .github/workflows/codeql.yml | 2 -- .github/workflows/tests.yml | 46 ++++++++++++++++++------------------ Dockerfile | 6 ++--- 3 files changed, 26 insertions(+), 28 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index d743f33d..2e98b691 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -17,8 +17,6 @@ on: pull_request: # The branches below must be a subset of the branches above branches: [main] - schedule: - - cron: "27 12 * * 0" jobs: analyze: diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 931ca6ec..ddc1d7fe 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -9,32 +9,13 @@ on: branches: [main] jobs: - go-static-checks: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - uses: actions/setup-go@v3 - with: - go-version: 1.18 - check-latest: true - cache: true - - name: Verify go.mod is tidy - run: | - go mod tidy - git diff --exit-code - - name: golangci-lint - uses: golangci/golangci-lint-action@v3 - with: - args: -v - skip-cache: true - eslint-checks: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - uses: actions/setup-node@v3 with: - node-version: "16" + node-version: "18" cache: yarn cache-dependency-path: "web/yarn.lock" - run: yarn @@ -49,7 +30,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-node@v3 with: - node-version: "16" + node-version: "18" cache: yarn cache-dependency-path: "web/yarn.lock" - run: yarn @@ -64,7 +45,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-node@v3 with: - node-version: "16" + node-version: "18" cache: yarn cache-dependency-path: "web/yarn.lock" - run: yarn @@ -73,13 +54,32 @@ jobs: run: yarn build working-directory: web + go-static-checks: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - uses: actions/setup-go@v3 + with: + go-version: 1.19 + check-latest: true + cache: true + - name: Verify go.mod is tidy + run: | + go mod tidy + git diff --exit-code + - name: golangci-lint + uses: golangci/golangci-lint-action@v3 + with: + args: -v + skip-cache: true + go-tests: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - uses: actions/setup-go@v3 with: - go-version: 1.18 + go-version: 1.19 check-latest: true cache: true - name: Run all tests diff --git a/Dockerfile b/Dockerfile index e902a67b..2685444c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Build frontend dist. -FROM node:16.15.0-alpine AS frontend +FROM node:18.12.1-alpine3.16 AS frontend WORKDIR /frontend-build COPY ./web/ . @@ -8,7 +8,7 @@ RUN yarn RUN yarn build # Build backend exec file. -FROM golang:1.18.3-alpine3.16 AS backend +FROM golang:1.19.3-alpine3.16 AS backend WORKDIR /backend-build RUN apk update @@ -20,7 +20,7 @@ COPY --from=frontend /frontend-build/dist ./server/dist RUN go build -o memos ./bin/server/main.go # Make workspace with above generated files. -FROM alpine:3.16.0 AS monolithic +FROM alpine:3.16 AS monolithic WORKDIR /usr/local/memos COPY --from=backend /backend-build/memos /usr/local/memos/