Skip to content

Commit

Permalink
fix(ci): update workflow
Browse files Browse the repository at this point in the history
  • Loading branch information
Mihoub2 committed Sep 17, 2024
1 parent 3266d22 commit 824b180
Show file tree
Hide file tree
Showing 10 changed files with 27 additions and 16,691 deletions.
11 changes: 5 additions & 6 deletions .github/workflows/staging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,13 @@ jobs:

- name: Build client (Vite.js)
run: |
bun i
cd client
npm ci
npm run build
bunx --bun vite build client --emptyOutDir --outDir '../server/public'
docker build -t ${{ github.repository }} .
- name: Build server (Bun)
run: |
cd server
bun install
cd ..
docker build -t ${{ github.repository }} .
- name: Get Tag
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ dist
dist-ssr
*.local
.env
server/public

# Editor directories and files
.vscode/*
Expand Down
Binary file added bun.lockb
Binary file not shown.
9 changes: 3 additions & 6 deletions client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,9 @@
"version": "0.0.0",
"type": "module",
"scripts": {
"build": "vite build --emptyOutDir",
"dev": "vite",
"lint": "eslint src --ext js,jsx --report-unused-disable-directives --max-warnings 0",
"preview": "vite preview",
"start": "npm run dev",
"deploy": "git switch main && git pull origin main --rebase --tags && git merge staging && npm version $npm_config_level && git push origin main --tags && git switch staging"
"dev": "bunx --bun vite",
"build": "bunx --bun vite build --emptyOutDir --outDir '../server/public'",
"lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0"
},
"dependencies": {
"@dataesr/dsfr-plus": "^0.4.1",
Expand Down
2 changes: 1 addition & 1 deletion client/stats.html

Large diffs are not rendered by default.

6 changes: 1 addition & 5 deletions client/vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,7 @@ import path from "path";

// https://vitejs.dev/config/
export default defineConfig({
plugins: [react(), (visualizer as any).default() as PluginOption],
build: {
outDir: "../server/public",
emptyOutDir: true,
},
plugins: [react(), visualizer() as PluginOption],
resolve: {
alias: {
"@": path.resolve(__dirname + "/src"),
Expand Down
Loading

0 comments on commit 824b180

Please sign in to comment.