Skip to content

Commit ea61b95

Browse files
committed
Merge branch 'master' into feature/plonk
2 parents 6638660 + 86f97e8 commit ea61b95

File tree

26 files changed

+1850
-2035
lines changed

26 files changed

+1850
-2035
lines changed

.dockerignore

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
node_modules
2+
.DS_Store
3+
.idea
4+
.vscode
5+
.npm
6+
.eslintcache
7+
Dockerfile
8+
.git
9+
.gitignore
10+
.env
11+
12+
# Compilation output
13+
/build-test/
14+
/dist
15+
16+
# Coverage
17+
.nyc_output
18+
coverage.json
19+
coverage
20+
21+
# Logs
22+
logs
23+
*.log
24+
npm-debug.log*
25+
yarn-debug.log*
26+
yarn-error.log*
27+
lerna-debug.log*
28+
29+
# Runtime data
30+
pids
31+
*.pid
32+
*.seed
33+
*.pid.lock
34+
35+
# node-waf configuration
36+
.lock-wscript

.github/workflows/tests.yml

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -18,21 +18,14 @@ jobs:
1818
- 18
1919
- 20
2020
steps:
21-
- uses: actions/setup-node@v3
22-
with:
23-
node-version: '${{ matrix.node }}'
21+
- name: Checkout the repository
22+
uses: actions/checkout@v3
2423

25-
- uses: actions/checkout@v3
26-
- name: 'Cache node_modules'
27-
uses: actions/cache@v3
28-
with:
29-
path: ~/.npm
30-
key: ${{ runner.os }}-node-v${{ matrix.node }}-${{ hashFiles('**/package.json') }}
31-
restore-keys: |
32-
${{ runner.os }}-node-v${{ matrix.node }}
24+
- name: Setup Docker Buildx
25+
uses: docker/setup-buildx-action@v2
3326

34-
- name: Install Dependencies
35-
run: npm install
27+
- name: Build Docker image
28+
run: docker build --build-arg NODE_VERSION=${{ matrix.node }} -t hardhat-zkit-node${{ matrix.node }} --progress=plain .
3629

37-
- name: Run All Tests
38-
run: npm run test
30+
- name: Run tests
31+
run: docker run --rm hardhat-zkit-node${{ matrix.node }} test-local

.gitignore

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,22 @@
11
node_modules
22
.DS_Store
33
.idea
4+
.vscode
45
.eslintcache
6+
.env
7+
.npm
58

69
# Hardhat files
710
artifacts
8-
coverage.json
9-
coverage
10-
11-
publish
12-
!publish/package.json
1311

1412
# Compilation output
1513
/build-test/
1614
/dist
1715

16+
# Coverage
1817
.nyc_output
19-
20-
# Below is Github's node gitignore template,
21-
# ignoring the node_modules part, as it'd ignore every node_modules, and we have some for testing
18+
coverage.json
19+
coverage
2220

2321
# Logs
2422
logs
@@ -41,7 +39,5 @@ pids
4139
typings/
4240
**/.storage.json
4341

44-
# Optional npm cache directory
45-
.npm
46-
47-
!src/**/artifacts
42+
# Exclude
43+
!src/**/artifacts

Dockerfile

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
ARG NODE_VERSION=20
2+
3+
FROM node:${NODE_VERSION} AS base
4+
WORKDIR /hardhat-zkit
5+
6+
FROM base AS install
7+
RUN mkdir -p /temp/dev
8+
COPY package.json package-lock.json /temp/dev/
9+
RUN cd /temp/dev && npm ci
10+
11+
FROM base AS dev
12+
COPY --from=install /temp/dev/node_modules node_modules
13+
COPY . .
14+
15+
ENTRYPOINT ["npm", "run"]

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ module.exports = {
5757
skipFiles: [],
5858
c: false,
5959
json: false,
60-
optimization: "O2",
60+
optimization: "O1",
6161
},
6262
setupSettings: {
6363
contributionSettings: {

0 commit comments

Comments
 (0)