Skip to content

Commit e376cc6

Browse files
committed
Merge branch 'main' into next
2 parents 253d7ca + eafe75e commit e376cc6

6 files changed

Lines changed: 61 additions & 92 deletions

File tree

.github/workflows/build-push-next.yml

Lines changed: 10 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ name: Next Build Deploy Test Push
33
env:
44
VERCEL_ORG_ID: ${{ secrets.VERCEL_ORG_ID }}
55
VERCEL_PROJECT_ID: ${{ secrets.VERCEL_PROJECT_ID }}
6+
GH_TOKEN: ${{secrets.PULL_REQ}}
67

78
on:
89
schedule:
@@ -13,39 +14,27 @@ jobs:
1314
build-and-deploy:
1415
runs-on: ubuntu-latest
1516

17+
permissions:
18+
# Give the default GITHUB_TOKEN write permission to commit and push the
19+
# added or changed files to the repository.
20+
contents: write
21+
1622
steps:
1723
- name: Checkout Repository
1824
uses: actions/checkout@v4
1925
with:
2026
repository: eelab-dev/EEcircuit
2127
ref: next # Checkout the "next" branch
2228

23-
- name: Set up Docker Buildx
24-
uses: docker/setup-buildx-action@v3
25-
26-
- name: Create Empty Build Directory
27-
run: mkdir -p Docker/build
28-
29-
- name: Build Docker Image
30-
run: docker build --no-cache -t eecircuit ./Docker
31-
32-
- name: Run Docker Container
33-
run: docker run -t -v $(realpath ./Docker):/mnt eecircuit
34-
35-
- name: Run Inject.js
36-
run: node ./Docker/inject.mjs
37-
38-
- name: Rename and Copy Files to Main Directory
39-
run: |
40-
cp ./Docker/build/spice.wasm ./src/sim/spice.wasm
41-
cp ./Docker/build/spice-eesim.js ./src/sim/spice.js
42-
4329
- name: Update Dependencies
4430
run: npx --yes npm-check-updates -u
4531

4632
- name: Install Dependencies
4733
run: npm install
4834

35+
- name: Update engine to next version
36+
run: npm install eecircuit-engine@next
37+
4938
- name: Build Project with Vite
5039
run: npm run build
5140

@@ -65,6 +54,7 @@ jobs:
6554
path: playwright-report/
6655
retention-days: 30
6756

57+
# auto commit
6858
- uses: stefanzweifel/git-auto-commit-action@v5
6959
with:
7060
commit_message: Auto updates after tests

.github/workflows/codeql-analysis.yml

Lines changed: 0 additions & 62 deletions
This file was deleted.

index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<meta name="title" content="EEcircuit" />
1111
<meta
1212
name="description"
13-
content="A browser based SPICE circuit simulator using WebAssembly technology"
13+
content="EEcircuit is a circuit simulator based on ngspice and it runs inside the browser using WebAssembly technology. The input is spice based netlist, and the output is results of the analysis that you're doing in the simulations. You are able to plot and view the results directly in the browser using high-performance WebGL plotting library webgl-plot, or download the data in CSV format for further analysis. Notice that your netlist and results are processed locally and always remain inside your browser and are never uploaded to network. The focus of this implementation is rapid analysis, sharing circuits ideas and results in VLSI and chip-design communities."
1414
/>
1515

1616
<!-- Facebook Meta Tags -->

package-lock.json

Lines changed: 37 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,9 @@
5353
"react": "^19.0.0",
5454
"react-dom": "^19.0.0",
5555
"react-icons": "^5.5.0",
56-
"webgl-plot": "^0.7.2"
56+
"webgl-plot": "^0.7.2",
57+
"@vercel/analytics": "^1.4.1",
58+
"@vercel/speed-insights": "^1.1.0"
5759
},
5860
"optionalDependencies": {
5961
"@rollup/rollup-linux-x64-gnu": "4.35.0"

src/layout.tsx

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,22 @@
11
//import { Provider } from "./components/ui/provider.tsx"
2-
import { ColorModeProvider } from "./components/ui/color-mode"
3-
import { ChakraProvider, defaultSystem } from "@chakra-ui/react"
2+
import { ColorModeProvider } from "./components/ui/color-mode";
3+
import { ChakraProvider, defaultSystem } from "@chakra-ui/react";
4+
import { Analytics } from "@vercel/analytics/react";
5+
import { SpeedInsights } from "@vercel/speed-insights/react";
46

57
import React, { JSX } from "react";
68
import EEcircuit from "./EEcircuit.tsx";
79

810
const Layout = (): JSX.Element => {
9-
10-
1111
return (
1212
<div>
1313
<ChakraProvider value={defaultSystem}>
14-
<ColorModeProvider>
15-
<EEcircuit />
16-
</ColorModeProvider>
17-
</ChakraProvider>
14+
<ColorModeProvider>
15+
<Analytics />
16+
<SpeedInsights />
17+
<EEcircuit />
18+
</ColorModeProvider>
19+
</ChakraProvider>
1820
</div>
1921
);
2022
};

0 commit comments

Comments
 (0)