From 3408465df68aabd7f0512ec3cbe70cfab7cdef28 Mon Sep 17 00:00:00 2001 From: xiaojunnuo Date: Fri, 26 Jul 2024 22:01:42 +0800 Subject: [PATCH] chore: --- .github/workflows/build-image.yml | 12 +++++++++++- build.trigger | 2 +- packages/ui/Dockerfile | 4 ++-- packages/ui/certd-client/src/mock/index.ts | 4 ++-- 4 files changed, 16 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-image.yml b/.github/workflows/build-image.yml index 07e4cbe8..89a63a0f 100644 --- a/.github/workflows/build-image.yml +++ b/.github/workflows/build-image.yml @@ -16,7 +16,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout Code - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: get_certd_version id: get_certd_version @@ -33,6 +33,16 @@ jobs: const pkg = JSON.parse(jsonContent) console.log("certd_version:",pkg.version); return pkg.version + - name: Use Node.js ${{ matrix.node-version }} + uses: actions/setup-node@v3 + with: + node-version: 18 + cache: 'npm' + - run: | + npm install -g pnpm + pnpm install + npm run build + working-directory: ./packages/ui/certd-client - name: Set up QEMU uses: docker/setup-qemu-action@v3 diff --git a/build.trigger b/build.trigger index 7fe4e495..d00491fd 100644 --- a/build.trigger +++ b/build.trigger @@ -1 +1 @@ -91 +1 diff --git a/packages/ui/Dockerfile b/packages/ui/Dockerfile index 776eeb07..272f3e63 100644 --- a/packages/ui/Dockerfile +++ b/packages/ui/Dockerfile @@ -4,10 +4,10 @@ WORKDIR /workspace/ COPY . /workspace/ RUN npm install -g pnpm@8.15.7 -RUN cd /workspace/certd-client && pnpm install && npm run build +#RUN cd /workspace/certd-client && pnpm install && npm run build +RUN cp /workspace/certd-client/dist/* /workspace/certd-server/public/ -rf RUN cd /workspace/certd-server && pnpm install && npm run build-on-docker -RUN cp /workspace/certd-client/dist/* /workspace/certd-server/public/ -rf FROM node:18-alpine WORKDIR /app/ diff --git a/packages/ui/certd-client/src/mock/index.ts b/packages/ui/certd-client/src/mock/index.ts index b424d1b1..f140e47f 100644 --- a/packages/ui/certd-client/src/mock/index.ts +++ b/packages/ui/certd-client/src/mock/index.ts @@ -13,10 +13,10 @@ const list: any = []; _.forEach(commonMocks, (value: any) => { list.push(value.default); }); -_.forEach(apiMocks, (value) => { +_.forEach(apiMocks, (value: any) => { list.push(value.default); }); -_.forEach(viewMocks, (value) => { +_.forEach(viewMocks, (value: any) => { list.push(value.default); });