Merge pull request #46 from nbtca/main

Update dev branch

.github/workflows/main.yml

@@ -1,4 +1,4 @@
-name: build-deploy
+name: main
 
 on:
   push:
@@ -19,30 +19,42 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      # 切换分支
+      - uses: actions/checkout@v4
-      - name: Checkout
-        uses: actions/checkout@master
 
-      - name: Login DockerHub
+      - uses: docker/build-push-action@v6
+        with:
+          context: .
+          file: ./Dockerfile
+          no-cache: true
+          platforms: linux/amd64
+          tags: |
+            ${{ env.IMAGE_NAME_FULL }}
+
+  build-and-push:
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Login
         uses: docker/login-action@v2
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Build and Push to DockerHub
+      - name: Build and Push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v6
         with:
           context: .
           file: ./Dockerfile
           no-cache: true
-          # target: deploy
           push: true
           platforms: linux/amd64
           tags: |
             ${{ env.IMAGE_NAME_FULL }}:${{ github.ref_name }}
 
-      - name: ssh pipelines
+      - name: Deploy
         uses: appleboy/ssh-action@v1.0.0
         env:
           BRANCH_NAME: ${{ github.ref_name }}

package.json

@@ -26,7 +26,7 @@
     "@logto/browser": "^2.2.18",
     "@nextui-org/react": "^2.4.8",
     "@stylistic/eslint-plugin": "^2.8.0",
-    "astro": "^4.15.9",
+    "astro": "^4.16.1",
     "framer-motion": "^11.9.0",
     "ical.js": "^1.5.0",
     "md5": "^2.3.0",