Skip to content
This repository has been archived by the owner on Dec 13, 2024. It is now read-only.

Commit

Permalink
Merge both docs and frontend
Browse files Browse the repository at this point in the history
  • Loading branch information
AnnsAnns committed May 6, 2024
1 parent 9bc3fab commit a7601aa
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 47 deletions.
39 changes: 0 additions & 39 deletions .github/workflows/build_docs.yml

This file was deleted.

20 changes: 13 additions & 7 deletions .github/workflows/build_frontend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,20 +35,26 @@ jobs:
- name: Install Bun
uses: oven-sh/setup-bun@v1

- name: CD frontend
run: cd frontend
- name: Install Frontend
run: cd frontend && bun install

- name: Build Frontend
run: cd frontend && bun run build

- name: Install Docs
run: bun install
run: cd docs && bun install

- name: Build
run: bun run build
- name: Build Docs
run: cd docs && bun run build

- name: Create base dist folder
run: mkdir -p ../dist
run: mkdir -p ./dist && mkdir -p ./dist/docs

- name: Copy frontend dist to base dist
run: cp -r .frontend/dist ./dist

- name: Copy docs dist to base dist
run: cp -r .docs/dist ./dist/docs

- name: Setup Pages
uses: actions/configure-pages@v5
Expand All @@ -57,7 +63,7 @@ jobs:
uses: actions/upload-pages-artifact@v3
with:
# Upload entire repository
path: './frontend/dist'
path: './dist'

- name: Deploy to GitHub Pages
id: deployment
Expand Down
2 changes: 1 addition & 1 deletion docs/astro.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import starlight from '@astrojs/starlight';

// https://astro.build/config
export default defineConfig({
base: '/teamagochi',
base: '/teamagochi/docs',
trailingSlash: 'always',
site: 'https://smartuni.github.io',
integrations: [
Expand Down
Binary file modified frontend/bun.lockb
Binary file not shown.

0 comments on commit a7601aa

Please sign in to comment.