Skip to content

Commit

Permalink
Merge branch 'master' into aaronmgdr/no-exchange
Browse files Browse the repository at this point in the history
  • Loading branch information
nicolasbrugneaux authored Feb 6, 2024
2 parents 7750001 + c0357e0 commit e813a8c
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 6 deletions.
2 changes: 2 additions & 0 deletions .changeset/clean-parents-run.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
---
2 changes: 1 addition & 1 deletion .github/workflows/containers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
# CeloCli standalone image
celocli-standalone:
uses: celo-org/reusable-workflows/.github/workflows/container-cicd.yaml@v1.14.1
uses: celo-org/reusable-workflows/.github/workflows/container-cicd.yaml@v2.0.1
name: Build us-west1-docker.pkg.dev/devopsre/dev-images/celocli:${{ needs.split-version.outputs.CELOCLI_VERSION }}
needs: ['split-version']
# if: |
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
"typescript": "5.3.3"
},
"resolutions": {
"ganache": "npm:@soloseng/[email protected]beta.1",
"ganache": "npm:@celo/[email protected]unofficial.0",
"bip39": "https://github.com/bitcoinjs/bip39#a7ecbfe2e60d0214ce17163d610cad9f7b23140c",
"blind-threshold-bls": "npm:@celo/[email protected]",
"@types/bn.js": "4.11.6",
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -12253,9 +12253,9 @@ __metadata:
languageName: node
linkType: hard

"ganache@npm:@soloseng/[email protected]beta.1":
version: 7.8.0-beta.1
resolution: "@soloseng/ganache@npm:7.8.0-beta.1"
"ganache@npm:@celo/[email protected]unofficial.0":
version: 7.8.0-unofficial.0
resolution: "@celo/ganache@npm:7.8.0-unofficial.0"
dependencies:
"@trufflesuite/bigint-buffer": "npm:*"
"@trufflesuite/uws-js-unofficial": "npm:20.10.0-unofficial.2"
Expand All @@ -12279,7 +12279,7 @@ __metadata:
bin:
ganache: dist/node/cli.js
ganache-cli: dist/node/cli.js
checksum: c5637ff3c72498a44d49f8eeceef1d9adb17d058135072c6d9d9a8fe4724e78c7b17f6c96d95a869f7ded73b3e0bd7d80911ad0ca5f02ac317196d6cd4e5e02d
checksum: f925d809d2f53f91ef249a318aebaed54ce34a876f4ce56481de62464370599c6f0191af22ece71df960d5b36e4ed0f075fcd8432ac6f8326bcf8e9527a147eb
languageName: node
linkType: hard

Expand Down

0 comments on commit e813a8c

Please sign in to comment.