Merge remote-tracking branch 'github/main'

CyanChanges · Dec 13, 2024 · 4ab84a8 · 4ab84a8
2 parents a07ee70 + 07e31ed
commit 4ab84a8
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 11 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -18,32 +18,34 @@ jobs:
       - uses: oven-sh/setup-bun@v2
         with:
           bun-version: latest
-      - name: Cache Black Hole
+      - name: Restore Blackhole
         uses: actions/cache/restore@v4
         with:
-          path: node_modules
+          path: |
+            node_modules
           key: blackhole
       # Pick your own package manager and build script
       - run: bun install --locked
-      - name: Save Black Hole
+      - name: Save Blackhole
         uses: actions/cache/save@v4
         with:
-          path: node_modules
+          path: |
+            node_modules
           key: blackhole
-      - run: bun run build --preset github_pages
+      - run: bun run generate
       - name: Upload artifact
         uses: actions/upload-artifact@v4
         with:
           name: build-output
-          path: ./.output/public
+          path: dist
   # Deployment job
   deploy:
     # Add a dependency to the build job
     needs: build
     # Grant GITHUB_TOKEN the permissions required to make a Pages deployment
     permissions:
       contents: write   # to deploy to gh_pages branch
-      # pages: write      # to deploy to Pages
+      pages: write      # to deploy to Pages
       id-token: write   # to verify the deployment originates from an appropriate source
     # Deploy to the github_pages environment
     environment:
@@ -58,7 +60,22 @@ jobs:
         with:
           name: build-output
           path: dist
-      - name: Deploy to gh_pages branch
+      - name: Setup Pages
+        uses: actions/configure-pages@v5
+        with:
+          # Automatically inject router.base in your Nuxt configuration file and set
+          # target to static (https://nuxtjs.org/docs/configuration-glossary/configuration-target/).
+          #
+          # You may remove this line if you want to manage the configuration yourself.
+          static_site_generator: nuxt
+      - name: Upload artifact
+        uses: actions/upload-pages-artifact@v3
+        with:
+          path: ./dist
+      - uses: actions/deploy-pages@v4
+        name: Deploy to GitHub Pages
+        id: deployment
+      - name: Save to gh_pages branch
         uses: peaceiris/actions-gh-pages@v4
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}

diff --git a/README.md b/README.md
@@ -1,14 +1,18 @@
 # Cyan Home
-[![Sync](https://github.com/CyanChanges/home/actions/workflows/sync.yml/badge.svg)](https://github.com/CyanChanges/home/actions/workflows/sync.yml)  
+[![Sync](https://github.com/CyanChanges/home/actions/workflows/sync.yml/badge.svg)](https://github.com/CyanChanges/home/actions/workflows/sync.yml) 
+[![Deploy](https://github.com/CyanChanges/home/actions/workflows/deploy.yml/badge.svg)](https://github.com/CyanChanges/home/actions/workflows/deploy.yml)  
+![Netlify](https://img.shields.io/netlify/0f0d5a7a-0760-4579-87d7-c47d1d832f1f) 
+[![Netlify Status](https://api.netlify.com/api/v1/badges/0f0d5a7a-0760-4579-87d7-c47d1d832f1f/deploy-status)](https://app.netlify.com/sites/cyan-home/deploys)  
+
 Built with Bun + Nuxt + PrimeVue
 
 
 ## Browse now
 
 Try access any of the following:
 
-| Defaults | Cloudflare(Netlify) | Netlify | GitHubPages |  
-| -------- | ------------------- | ------- | ----------- |
+| Defaults | Cloudflare(Netlify) | Netlify | GitHubPages❌ |  
+| -------- | ------------------- | ------- | ------------- |
 | [cyans.me](https://cyans.me) | [www](https://www.cyans.me/) | [netlify.home](https://netlify.home.cyans.me/) | [ghpages.home](https://ghpages.home.cyans.me/) |
 
 ## Build