Skip to content

Commit

Permalink
Merge pull request #246 from RealityETH/prReferenceGitPackagesByCommit
Browse files Browse the repository at this point in the history
Pr reference git packages by commit, also restore ci tests that were disabled because they were broken by the issue this fixes
  • Loading branch information
edmundedgar authored Mar 1, 2024
2 parents fcd2a19 + a695bc0 commit 137dc41
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 27 deletions.
34 changes: 17 additions & 17 deletions .github/workflows/testhardhat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,22 +9,22 @@ on:
pull_request:
branches: [main, develop]

# Temporary disabled due to a dependency issue. Locally the tests are running fine.
# jobs:
# lint-and-test:
# runs-on: ubuntu-latest

# strategy:
# matrix:
# node-version: [16.x]
# os: [ubuntu-latest]
jobs:
lint-and-test:
runs-on: ubuntu-latest

# steps:
# - uses: actions/checkout@v3
# - uses: actions/setup-node@v3
# with:
# node-version: 16
# cache: 'npm'
# cache-dependency-path: ./package-lock.json
# - run: npm install
# - run: npx hardhat test
strategy:
matrix:
node-version: [16.x]
os: [ubuntu-latest]

steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 16
cache: 'npm'
cache-dependency-path: ./package-lock.json
- run: npm install
- run: npx hardhat test
16 changes: 8 additions & 8 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,15 @@
"hardhat": "^2.19.4"
},
"devDependencies": {
"@0xpolygonhermez/zkevm-commonjs": "github:0xPolygonHermez/zkevm-commonjs#v3.0.0-fork.6",
"@0xpolygonhermez/zkevm-commonjs": "github:0xPolygonHermez/zkevm-commonjs#2a5fee0cfd47d4d538270a0345dd1f062dba783d",
"@nomicfoundation/hardhat-network-helpers": "^1.0.10",
"@nomicfoundation/hardhat-verify": "^2.0.3",
"@nomiclabs/hardhat-ethers": "^2.2.3",
"@nomiclabs/hardhat-waffle": "^2.0.6",
"@openzeppelin/contracts": "^4.9.5",
"@openzeppelin/contracts-upgradeable": "^4.9.5",
"@openzeppelin/hardhat-upgrades": "1.22.1",
"@RealityETH/zkevm-contracts": "github:RealityETH/zkevm-contracts#v3.0.0-RealityETH",
"@RealityETH/zkevm-contracts": "github:RealityETH/zkevm-contracts#a090458140cdfce23763af887ff0767469368923",
"@types/sinon-chai": "^3.2.3",
"circomlibjs": "0.1.1",
"dotenv": "^8.6.0",
Expand Down

0 comments on commit 137dc41

Please sign in to comment.