Skip to content

Commit

Permalink
update: tests and main conflict resolve
Browse files Browse the repository at this point in the history
  • Loading branch information
kiriyaga committed Jan 8, 2024
2 parents 5f5c8be + 8aef626 commit 77c0738
Show file tree
Hide file tree
Showing 297 changed files with 8,216 additions and 3,281 deletions.
8 changes: 0 additions & 8 deletions .changeset/README.md

This file was deleted.

11 changes: 0 additions & 11 deletions .changeset/config.json

This file was deleted.

2 changes: 1 addition & 1 deletion .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ This ensures consistent code style throughout the project and helps identify pot

## Need Assistance?

If you're unsure about something or have questions, don't hesitate to open an issue or initiate a discussion in our [zkSync Community Hub](https://github.com/zkSync-Community-Hub/zkSync-developers/discussions). We're here to assist!
If you're unsure about something or have questions, don't hesitate to open an issue or initiate a discussion in our [zkSync Community Hub](https://github.com/zkSync-Community-Hub/zksync-developers/discussions). We're here to assist!

## What's Next?

Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/config.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
blank_issues_enabled: true
contact_links:
- name: zksync-developers Discussion
url: https://github.com/zkSync-Community-Hub/zkync-developers/discussions
url: https://github.com/zkSync-Community-Hub/zksync-developers/discussions
about: Please provide feedback, and ask questions here.
- name: hardhat-zksync plugins documentation page
url: https://era.zksync.io/docs/tools/hardhat/plugins.html
Expand Down
41 changes: 41 additions & 0 deletions .github/release-please/config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
{
"separate-pull-requests": true,
"group-pull-request-title-pattern": "chore(${component}): release at branch ${branch}",
"bootstrap-sha": "4d2086931dcebd7e7c21cad9cbd6668c2abbebbf",
"bump-minor-pre-major": true,
"bump-patch-for-minor-pre-major": false,
"packages": {
"packages/hardhat-zksync-deploy": {
"release-type": "node",
"component": "@matterlabs/hardhat-zksync-deploy"
},
"packages/hardhat-zksync-solc": {
"release-type": "node",
"component": "@matterlabs/hardhat-zksync-solc"
},
"packages/hardhat-zksync-upgradable": {
"release-type": "node",
"component": "@matterlabs/hardhat-zksync-upgradable"
},
"packages/hardhat-zksync-vyper": {
"release-type": "node",
"component": "@matterlabs/hardhat-zksync-vyper"
},
"packages/hardhat-zksync-verify": {
"release-type": "node",
"component": "@matterlabs/hardhat-zksync-verify"
},
"packages/hardhat-zksync-toolbox": {
"release-type": "node",
"component": "@matterlabs/hardhat-zksync-toolbox"
},
"packages/hardhat-zksync-node": {
"release-type": "node",
"component": "@matterlabs/hardhat-zksync-node"
},
"packages/hardhat-zksync-chai-matchers": {
"release-type": "node",
"component": "@matterlabs/hardhat-zksync-chai-matchers"
}
}
}
10 changes: 10 additions & 0 deletions .github/release-please/manifest.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"packages/hardhat-zksync-deploy": "1.1.2",
"packages/hardhat-zksync-solc": "1.0.6",
"packages/hardhat-zksync-upgradable": "1.2.1",
"packages/hardhat-zksync-vyper": "1.0.5",
"packages/hardhat-zksync-verify": "1.2.2",
"packages/hardhat-zksync-toolbox": "1.2.1",
"packages/hardhat-zksync-node": "1.0.1",
"packages/hardhat-zksync-chai-matchers": "1.2.1"
}
18 changes: 18 additions & 0 deletions .github/workflows/check-pr-title.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
name: Check PR title
on:
pull_request_target:
types:
- opened
- reopened
- edited
- synchronize

jobs:
lint:
runs-on: ubuntu-latest
permissions:
statuses: write
steps:
- uses: aslafy-z/conventional-pr-title-action@v3
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
58 changes: 51 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,9 @@ jobs:
cd packages/hardhat-zksync-vyper
yarn test
deploy:
examples:
runs-on: ubuntu-latest
name: deploy
name: examples
steps:
- uses: actions/checkout@v2

Expand Down Expand Up @@ -88,11 +88,11 @@ jobs:
yarn hardhat compile
yarn hardhat deploy-zksync
#- name: Test node example
# run: |
# cd examples/node-example
# yarn hardhat compile
# yarn hardhat test
- name: Test node example
run: |
cd examples/node-example
yarn hardhat compile
yarn hardhat test
- name: Test noninline libraries example
run: |
Expand Down Expand Up @@ -193,6 +193,7 @@ jobs:
run: |
cd packages/hardhat-zksync-upgradable
yarn test
verify-vyper:
runs-on: ubuntu-latest
name: verify-vyper
Expand All @@ -213,6 +214,7 @@ jobs:
run: |
cd packages/hardhat-zksync-verify-vyper
yarn test
verify:
runs-on: ubuntu-latest
name: verify
Expand All @@ -233,6 +235,47 @@ jobs:
run: |
cd packages/hardhat-zksync-verify
yarn test
deploy:
runs-on: ubuntu-latest
name: deploy
steps:
- uses: actions/checkout@v2

- uses: actions/checkout@v2
with:
repository: matter-labs/local-setup
path: local-setup

- name: Run server
run: |
cd local-setup
./start.sh &>../server.log &
- uses: actions/setup-node@v2
with:
node-version: "16"
cache: yarn

- name: Setup environment
run: |
yarn install
yarn build
- name: Wait until server is up
run: |
while ! curl -s -X POST -d '{"jsonrpc":"2.0","method":"net_version","id":1}' -H 'Content-Type: application/json' 0.0.0.0:3050; do sleep 1; done
- name: Test deploy package
run: |
cd packages/hardhat-zksync-deploy
yarn test
- name: Show logs
if: always()
run: |
cat server.log
zksync-ethers:
runs-on: ubuntu-latest
name: zksync-ethers
Expand Down Expand Up @@ -272,6 +315,7 @@ jobs:
if: always()
run: |
cat server.log
node:
runs-on: ubuntu-latest
name: node
Expand Down
29 changes: 0 additions & 29 deletions .github/workflows/create-release-pull-request.yml

This file was deleted.

27 changes: 27 additions & 0 deletions .github/workflows/github-release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
name: Publish packages to github

on:
push:
branches:
- main
- ethers-v5
workflow_dispatch:

permissions:
contents: write
pull-requests: write

jobs:
release-please:
runs-on: ubuntu-latest
outputs:
release_please_output: ${{ toJSON(steps.release.outputs) }}
steps:
- name: Run release-please
id: release
uses: google-github-actions/release-please-action@v4
with:
token: ${{ secrets.GITHUB_TOKEN }}
config-file: .github/release-please/config.json
manifest-file: .github/release-please/manifest.json
target-branch: ${{ github.ref_name }}
52 changes: 52 additions & 0 deletions .github/workflows/npm-publish.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
name: Publish packages to npm

on:
workflow_dispatch:
inputs:
tag:
required: true
type: choice
description: tag to publish
default: latest
options:
- latest
- beta
- alpha

package:
required: true
type: choice
description: package to publish
default: hardhat-zksync-deploy
options:
- hardhat-zksync-deploy
- hardhat-zksync-solc
- hardhat-zksync-upgradable
- hardhat-zksync-vyper
- hardhat-zksync-verify
- hardhat-zksync-toolbox
- hardhat-zksync-node
- hardhat-zksync-chai-matchers
- hardhat-zksync-ethers
- hardhat-zksync-verify-vyper

jobs:
publish:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3

- uses: actions/setup-node@v3
with:
node-version: '16'
registry-url: 'https://registry.npmjs.org'
cache: 'yarn'

- name: Setup environment
run: yarn && yarn build

- name: Publish
env:
NODE_AUTH_TOKEN: ${{ secrets.NPMJS_NPM_MATTERLABS_AUTOMATION_TOKEN }}
run: |
npm publish @matterlabs/${{inputs.package}} --tag ${{ inputs.tag }} --workspace=packages/${{inputs.package}} --access=public
55 changes: 0 additions & 55 deletions .github/workflows/publish-chai-matchers.yml

This file was deleted.

Loading

0 comments on commit 77c0738

Please sign in to comment.