From 59b903f5d4aa12cc0a31972cc05b8d124564f36a Mon Sep 17 00:00:00 2001 From: GZTime Date: Sat, 25 Feb 2023 01:10:03 +0800 Subject: [PATCH] ci: update --- .github/workflows/ci.yml | 20 +++++++++----------- GZCTF/ClientApp/pnpm-lock.yaml | 6 +++--- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4d0437e81..42bb02b0d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -30,17 +30,15 @@ jobs: with: node-version: 18 - - run: npm i -g pnpm - - - run: dotnet build "CTFServer.csproj" -c Release -o build - - - run: dotnet publish "CTFServer.csproj" -c Release -o publish/linux/amd64 -r linux-x64 --no-self-contained /p:PublishReadyToRun=true - env: - VITE_APP_BUILD_TIMESTAMP: ${{ steps.time.outputs.time }} - VITE_APP_GIT_SHA: ${{ github.sha }} - VITE_APP_GIT_NAME: ${{ github.ref_name }} - - - run: dotnet publish "CTFServer.csproj" -c Release -o publish/linux/arm64 -r linux-arm64 --no-self-contained /p:PublishReadyToRun=true + - name: Prebuild Project + run: | + npm i -g pnpm + dotnet build "CTFServer.csproj" -c Release -o build + + - name: Publish Project + run: | + dotnet publish "CTFServer.csproj" -c Release -o publish/linux/amd64 -r linux-x64 --no-self-contained /p:PublishReadyToRun=true + dotnet publish "CTFServer.csproj" -c Release -o publish/linux/arm64 -r linux-arm64 --no-self-contained /p:PublishReadyToRun=true env: VITE_APP_BUILD_TIMESTAMP: ${{ steps.time.outputs.time }} VITE_APP_GIT_SHA: ${{ github.sha }} diff --git a/GZCTF/ClientApp/pnpm-lock.yaml b/GZCTF/ClientApp/pnpm-lock.yaml index 150bf4a93..330e6abfd 100644 --- a/GZCTF/ClientApp/pnpm-lock.yaml +++ b/GZCTF/ClientApp/pnpm-lock.yaml @@ -1441,7 +1441,7 @@ packages: hasBin: true dependencies: caniuse-lite: 1.0.30001457 - electron-to-chromium: 1.4.308 + electron-to-chromium: 1.4.310 node-releases: 2.0.10 update-browserslist-db: 1.0.10_browserslist@4.21.5 @@ -1692,8 +1692,8 @@ packages: zrender: 5.4.1 dev: false - /electron-to-chromium/1.4.308: - resolution: {integrity: sha512-qyTx2aDFjEni4UnRWEME9ubd2Xc9c0zerTUl/ZinvD4QPsF0S7kJTV/Es/lPCTkNX6smyYar+z/n8Cl6pFr8yQ==} + /electron-to-chromium/1.4.310: + resolution: {integrity: sha512-/xlATgfwkm5uDDwLw5nt/MNEf7c1oazLURMZLy39vOioGYyYzLWIDT8fZMJak6qTiAJ7udFTy7JG7ziyjNutiA==} /embla-carousel-autoplay/7.0.9_embla-carousel@7.0.9: resolution: {integrity: sha512-I8LhZ5iAyu8L3qoYgOgjnpHK5mv6c1w5a7IcT6Et24BqGf8D+yFWfI28ctz9YvrqH1QbyUezy5LfuaeGaqfclw==}