Merge pull request #23 from binhtran432k/feature/loader

feat: enhance loader
binhtran432k · Mar 26, 2024 · 1aa4fec · 1aa4fec
2 parents 6759f78 + 7b505c3
commit 1aa4fec
Show file tree

Hide file tree

Showing 12 changed files with 413 additions and 471 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -15,6 +15,13 @@ jobs:
       - name: Checkout respository
         uses: actions/checkout@v4
 
+      - name: Install rust toolchain
+        run: |
+          rustup update --no-self-update ${{ env.RUST_CHANNEL }}
+          rustup default ${{ env.RUST_CHANNEL }}
+        env:
+          RUST_CHANNEL: nightly
+
       - name: Cache cargo binaries
         uses: actions/cache@v4
         id: cache
@@ -66,7 +73,7 @@ jobs:
         run: bun install --frozen-lockfile
 
       - name: Check build sass
-        run: bun run sass
+        run: bun run deploy:sass
 
       - name: Check build static
         run: bun run check
diff --git a/.github/workflows/gh-page.yml b/.github/workflows/gh-page.yml
@@ -27,6 +27,13 @@ jobs:
       - name: Setup Pages
         uses: actions/configure-pages@v3
 
+      - name: Install rust toolchain
+        run: |
+          rustup update --no-self-update ${{ env.RUST_CHANNEL }}
+          rustup default ${{ env.RUST_CHANNEL }}
+        env:
+          RUST_CHANNEL: nightly
+
       - name: Cache cargo binaries
         uses: actions/cache@v4
         id: cache
@@ -77,16 +84,13 @@ jobs:
         if: steps.bun-cache.outputs.cache-hit != 'true'
         run: bun install --frozen-lockfile
 
-      - name: Generate css from scss
-        run: bun run sass
-
       - name: Build using Perseus
-        run: bun run build
+        run: bun run deploy
 
       - name: Upload artifact
         uses: actions/upload-pages-artifact@v1
         with:
-          path: ./dist/exported/
+          path: ./pkg/
 
   deploy:
     name: Deploy Github Pages