From 823efd4044c1fb511edfa8f91879e95acb4a76b6 Mon Sep 17 00:00:00 2001
From: nsnail <taokeu@gmail.com>
Date: Mon, 29 Apr 2024 18:28:59 +0800
Subject: [PATCH] =?UTF-8?q?ci:=20=F0=9F=8E=A1=20=E5=B7=A5=E4=BD=9C?=
 =?UTF-8?q?=E6=B5=81=E8=84=9A=E6=9C=AC=E4=BF=AE=E6=94=B9=20(#113)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/nightly-build.yml | 24 ++++++++----------------
 .github/workflows/release.yml       |  3 +--
 2 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/nightly-build.yml b/.github/workflows/nightly-build.yml
index 66c19799..9b34c2ce 100644
--- a/.github/workflows/nightly-build.yml
+++ b/.github/workflows/nightly-build.yml
@@ -18,8 +18,7 @@ jobs:
         with:
           fetch-depth: 0
           filter: tree:0
-      - name: Setup Node.js
-        uses: actions/setup-node@v3
+      - uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node-version }}
       # https://docs.github.com/zh/actions/using-workflows/caching-dependencies-to-speed-up-workflows#matching-a-cache-key
@@ -28,12 +27,9 @@ jobs:
           path: ~/.npm
           key: ${{ runner.os }}-npm-${{ hashFiles('./src/frontend/admin/package.json') }}
           restore-keys: ${{ runner.os }}-npm
-      - name: Publish frontend
-        working-directory: ./src/frontend/admin
-        run:
-          npm install && npm run build
-      - name: Setup .NET
-        uses: actions/setup-dotnet@v3
+      - working-directory: ./src/frontend/admin
+        run: npm install && npm run build
+      - uses: actions/setup-dotnet@v3
         with:
           dotnet-version: 9.0.x
       - uses: actions/cache@v3
@@ -41,15 +37,11 @@ jobs:
           path: ~/.nuget/packages
           key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj') }}
           restore-keys: ${{ runner.os }}-nuget
-      - name: Publish backend
-        working-directory: ./src/backend/NetAdmin.AdmServer.Host
+      - working-directory: ./src/backend/NetAdmin.AdmServer.Host
         run: dotnet publish NetAdmin.AdmServer.Host.csproj -c Release
-      - name: Build docker images
-        run: docker build -t nsnail/netadmin .
-      - name: Docker login
-        uses: docker/login-action@v3
+      - run: docker build -t nsnail/netadmin .
+      - uses: docker/login-action@v3
         with:
           username: "nsnail"
           password: "${{secrets.DOCKER_PASSWORD}}"
-      - name: Push docker images
-        run: docker push nsnail/netadmin
\ No newline at end of file
+      - run: docker push nsnail/netadmin
\ No newline at end of file
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 13d69973..eb66f7b3 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -28,8 +28,7 @@ jobs:
           key: ${{ runner.os }}-npm-${{ hashFiles('./src/frontend/admin/package.json') }}
           restore-keys: ${{ runner.os }}-npm
       - working-directory: ./src/frontend/admin
-        run:
-          npm install && npm run build
+        run: npm install && npm run build
       - uses: actions/setup-dotnet@v3
         with:
           dotnet-version: 9.0.x