Skip to content

Commit

Permalink
Merge branch 'main' into erc20_base_token
Browse files Browse the repository at this point in the history
  • Loading branch information
fkrause98 committed Jan 16, 2024
2 parents f97c03a + 4287161 commit 6a8f087
Show file tree
Hide file tree
Showing 358 changed files with 27,156 additions and 9,534 deletions.
File renamed without changes.
5 changes: 4 additions & 1 deletion ethereum/.eslintrc → .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,8 @@
"import/namespace": "off",
"import/no-unresolved": "off",
"import/order": "off"
}
},
"ignorePatterns": [
"**/lib/*"
]
}
8 changes: 2 additions & 6 deletions .githooks/pre-commit
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,11 @@ RED='\033[0;31m'

# Check that the code is formatted in the given directory provided in the first argument
function check_prettier {
cd $1
if ! yarn prettier:check; then
echo "${RED}Commit error! Cannot commit unformatted code!${NC}"
echo "Prettier errors found in the ${CYAN}$(pwd)${NC} directory."
echo "Please format the code via ${CYAN}cd $1 && yarn prettier:fix${NC}!"
echo "Prettier errors found. Please format the code via ${CYAN}yarn prettier:fix${NC}!"
exit 1
fi
cd ..
}

check_prettier "ethereum"
check_prettier "zksync"
check_prettier
8 changes: 2 additions & 6 deletions .githooks/pre-push
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,11 @@ RED='\033[0;31m'

# Checking that the code is linted and formatted in the given directory provided in the first argument
function check_lint {
cd $1
if ! yarn lint:check; then
echo "${RED}Push error! Cannot push unlinted code!${NC}"
echo "Lint errors found in the ${CYAN}$(pwd)${NC} directory."
echo "Please lint the code via ${CYAN}cd $1 && yarn lint:fix${NC} and/or fix the errors manually!"
echo "Lint errors found. Please lint the code via ${CYAN}yarn lint:fix${NC} and/or fix the errors manually!"
exit 1
fi
cd ..
}

check_lint "ethereum"
check_lint "zksync"
check_lint
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
---
name: Scripts-Related Bug Report
about: Use this template for reporting script-related bugs. For contract-related bugs, see our security policy.
title: ''
title: ""
labels: bug
assignees: ''
assignees: ""
---

### 🐛 Script Bug Report
Expand Down
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
---
name: Feature request
about: Use this template for requesting features
title: ''
title: ""
labels: feat
assignees: ''
assignees: ""
---

### 🌟 Feature Request
Expand Down
49 changes: 49 additions & 0 deletions .github/workflows/buld-release.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
name: Build and release

on:
push:
branches:
- "*"

jobs:
build-contracts:
runs-on: ubuntu-latest

steps:
- name: Checkout the repository
uses: actions/checkout@v3

- name: Use Node.js
uses: actions/setup-node@v3
with:
node-version: 18.18.0
cache: yarn

- name: Init
id: init
run: |
yarn
echo "release_tag=$(echo ${GITHUB_REF#refs/heads/})-$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
- name: Build contracts
run: |
yarn l1 build
yarn l2 build
yarn sc build
- name: Prepare artifacts
run: |
tar -czvf l1-contracts.tar.gz ./l1-contracts
tar -czvf l2-contracts.tar.gz ./l2-contracts
tar -czvf system-contracts.tar.gz ./system-contracts
- name: Release
uses: softprops/action-gh-release@v1
with:
tag_name: ${{ steps.init.outputs.release_tag }}
fail_on_unmatched_files: true
body: ""
files: |
l1-contracts.tar.gz
l2-contracts.tar.gz
system-contracts.tar.gz
275 changes: 0 additions & 275 deletions .github/workflows/ci.yml

This file was deleted.

Loading

0 comments on commit 6a8f087

Please sign in to comment.