From 1d1c2b3dc956142e15b1ba364d16dff75193cf73 Mon Sep 17 00:00:00 2001 From: Nabarun Date: Thu, 12 Oct 2023 11:27:19 +0530 Subject: [PATCH 1/3] Upgrade package version to 0.2.64 --- lerna.json | 2 +- packages/cache/package.json | 2 +- packages/cli/package.json | 12 ++++++------ packages/codegen/package.json | 4 ++-- .../src/templates/package-template.handlebars | 10 +++++----- packages/graph-node/package.json | 10 +++++----- packages/ipld-eth-client/package.json | 4 ++-- packages/peer/package.json | 2 +- packages/rpc-eth-client/package.json | 8 ++++---- packages/solidity-mapper/package.json | 4 ++-- packages/test/package.json | 2 +- packages/tracing-client/package.json | 2 +- packages/util/package.json | 8 ++++---- 13 files changed, 35 insertions(+), 35 deletions(-) diff --git a/lerna.json b/lerna.json index a06b944f7..41fa71503 100644 --- a/lerna.json +++ b/lerna.json @@ -2,7 +2,7 @@ "packages": [ "packages/*" ], - "version": "0.2.63", + "version": "0.2.64", "npmClient": "yarn", "useWorkspaces": true, "command": { diff --git a/packages/cache/package.json b/packages/cache/package.json index 4cb28195e..ee864d3aa 100644 --- a/packages/cache/package.json +++ b/packages/cache/package.json @@ -1,6 +1,6 @@ { "name": "@cerc-io/cache", - "version": "0.2.63", + "version": "0.2.64", "description": "Generic object cache", "main": "dist/index.js", "scripts": { diff --git a/packages/cli/package.json b/packages/cli/package.json index 4ea26b3af..9fec9909d 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@cerc-io/cli", - "version": "0.2.63", + "version": "0.2.64", "main": "dist/index.js", "license": "AGPL-3.0", "scripts": { @@ -12,13 +12,13 @@ }, "dependencies": { "@apollo/client": "^3.7.1", - "@cerc-io/cache": "^0.2.63", - "@cerc-io/ipld-eth-client": "^0.2.63", + "@cerc-io/cache": "^0.2.64", + "@cerc-io/ipld-eth-client": "^0.2.64", "@cerc-io/libp2p": "^0.42.2-laconic-0.1.4", "@cerc-io/nitro-node": "^0.1.13", - "@cerc-io/peer": "^0.2.63", - "@cerc-io/rpc-eth-client": "^0.2.63", - "@cerc-io/util": "^0.2.63", + "@cerc-io/peer": "^0.2.64", + "@cerc-io/rpc-eth-client": "^0.2.64", + "@cerc-io/util": "^0.2.64", "@ethersproject/providers": "^5.4.4", "@graphql-tools/utils": "^9.1.1", "@ipld/dag-cbor": "^8.0.0", diff --git a/packages/codegen/package.json b/packages/codegen/package.json index da0e84ebb..0f050cf19 100644 --- a/packages/codegen/package.json +++ b/packages/codegen/package.json @@ -1,6 +1,6 @@ { "name": "@cerc-io/codegen", - "version": "0.2.63", + "version": "0.2.64", "description": "Code generator", "private": true, "main": "index.js", @@ -20,7 +20,7 @@ }, "homepage": "https://github.com/cerc-io/watcher-ts#readme", "dependencies": { - "@cerc-io/util": "^0.2.63", + "@cerc-io/util": "^0.2.64", "@graphql-tools/load-files": "^6.5.2", "@poanet/solidity-flattener": "https://github.com/vulcanize/solidity-flattener.git", "@solidity-parser/parser": "^0.13.2", diff --git a/packages/codegen/src/templates/package-template.handlebars b/packages/codegen/src/templates/package-template.handlebars index b33cdc154..3c12ccd0a 100644 --- a/packages/codegen/src/templates/package-template.handlebars +++ b/packages/codegen/src/templates/package-template.handlebars @@ -41,12 +41,12 @@ "homepage": "https://github.com/cerc-io/watcher-ts#readme", "dependencies": { "@apollo/client": "^3.3.19", - "@cerc-io/cli": "^0.2.63", - "@cerc-io/ipld-eth-client": "^0.2.63", - "@cerc-io/solidity-mapper": "^0.2.63", - "@cerc-io/util": "^0.2.63", + "@cerc-io/cli": "^0.2.64", + "@cerc-io/ipld-eth-client": "^0.2.64", + "@cerc-io/solidity-mapper": "^0.2.64", + "@cerc-io/util": "^0.2.64", {{#if (subgraphPath)}} - "@cerc-io/graph-node": "^0.2.63", + "@cerc-io/graph-node": "^0.2.64", {{/if}} "@ethersproject/providers": "^5.4.4", "apollo-type-bigint": "^0.1.3", diff --git a/packages/graph-node/package.json b/packages/graph-node/package.json index 74e43640f..23cca86a5 100644 --- a/packages/graph-node/package.json +++ b/packages/graph-node/package.json @@ -1,10 +1,10 @@ { "name": "@cerc-io/graph-node", - "version": "0.2.63", + "version": "0.2.64", "main": "dist/index.js", "license": "AGPL-3.0", "devDependencies": { - "@cerc-io/solidity-mapper": "^0.2.63", + "@cerc-io/solidity-mapper": "^0.2.64", "@ethersproject/providers": "^5.4.4", "@graphprotocol/graph-ts": "^0.22.0", "@nomiclabs/hardhat-ethers": "^2.0.2", @@ -51,9 +51,9 @@ "dependencies": { "@apollo/client": "^3.3.19", "@cerc-io/assemblyscript": "0.19.10-watcher-ts-0.1.2", - "@cerc-io/cache": "^0.2.63", - "@cerc-io/ipld-eth-client": "^0.2.63", - "@cerc-io/util": "^0.2.63", + "@cerc-io/cache": "^0.2.64", + "@cerc-io/ipld-eth-client": "^0.2.64", + "@cerc-io/util": "^0.2.64", "@types/json-diff": "^0.5.2", "@types/yargs": "^17.0.0", "bn.js": "^4.11.9", diff --git a/packages/ipld-eth-client/package.json b/packages/ipld-eth-client/package.json index d4ebd9b19..638325dab 100644 --- a/packages/ipld-eth-client/package.json +++ b/packages/ipld-eth-client/package.json @@ -1,6 +1,6 @@ { "name": "@cerc-io/ipld-eth-client", - "version": "0.2.63", + "version": "0.2.64", "description": "IPLD ETH Client", "main": "dist/index.js", "scripts": { @@ -20,7 +20,7 @@ "homepage": "https://github.com/cerc-io/watcher-ts#readme", "dependencies": { "@apollo/client": "^3.7.1", - "@cerc-io/cache": "^0.2.63", + "@cerc-io/cache": "^0.2.64", "cross-fetch": "^3.1.4", "debug": "^4.3.1", "ethers": "^5.4.4", diff --git a/packages/peer/package.json b/packages/peer/package.json index 88372b0e7..8bc691c84 100644 --- a/packages/peer/package.json +++ b/packages/peer/package.json @@ -1,6 +1,6 @@ { "name": "@cerc-io/peer", - "version": "0.2.63", + "version": "0.2.64", "description": "libp2p module", "main": "dist/index.js", "exports": "./dist/index.js", diff --git a/packages/rpc-eth-client/package.json b/packages/rpc-eth-client/package.json index f55037230..d3024e89a 100644 --- a/packages/rpc-eth-client/package.json +++ b/packages/rpc-eth-client/package.json @@ -1,6 +1,6 @@ { "name": "@cerc-io/rpc-eth-client", - "version": "0.2.63", + "version": "0.2.64", "description": "RPC ETH Client", "main": "dist/index.js", "scripts": { @@ -19,9 +19,9 @@ }, "homepage": "https://github.com/cerc-io/watcher-ts#readme", "dependencies": { - "@cerc-io/cache": "^0.2.63", - "@cerc-io/ipld-eth-client": "^0.2.63", - "@cerc-io/util": "^0.2.63", + "@cerc-io/cache": "^0.2.64", + "@cerc-io/ipld-eth-client": "^0.2.64", + "@cerc-io/util": "^0.2.64", "chai": "^4.3.4", "ethers": "^5.4.4", "left-pad": "^1.3.0", diff --git a/packages/solidity-mapper/package.json b/packages/solidity-mapper/package.json index c26599961..8d1799096 100644 --- a/packages/solidity-mapper/package.json +++ b/packages/solidity-mapper/package.json @@ -1,10 +1,10 @@ { "name": "@cerc-io/solidity-mapper", - "version": "0.2.63", + "version": "0.2.64", "main": "dist/index.js", "license": "AGPL-3.0", "devDependencies": { - "@cerc-io/ipld-eth-client": "^0.2.63", + "@cerc-io/ipld-eth-client": "^0.2.64", "@ethersproject/abi": "^5.3.0", "@nomiclabs/hardhat-ethers": "^2.0.2", "@nomiclabs/hardhat-waffle": "^2.0.1", diff --git a/packages/test/package.json b/packages/test/package.json index 8f63660ea..3951cbce0 100644 --- a/packages/test/package.json +++ b/packages/test/package.json @@ -1,6 +1,6 @@ { "name": "@cerc-io/test", - "version": "0.2.63", + "version": "0.2.64", "main": "dist/index.js", "license": "AGPL-3.0", "private": true, diff --git a/packages/tracing-client/package.json b/packages/tracing-client/package.json index b0f35b665..7a92561e5 100644 --- a/packages/tracing-client/package.json +++ b/packages/tracing-client/package.json @@ -1,6 +1,6 @@ { "name": "@cerc-io/tracing-client", - "version": "0.2.63", + "version": "0.2.64", "description": "ETH VM tracing client", "main": "dist/index.js", "scripts": { diff --git a/packages/util/package.json b/packages/util/package.json index 01634cb38..7091c5c11 100644 --- a/packages/util/package.json +++ b/packages/util/package.json @@ -1,13 +1,13 @@ { "name": "@cerc-io/util", - "version": "0.2.63", + "version": "0.2.64", "main": "dist/index.js", "license": "AGPL-3.0", "dependencies": { "@apollo/utils.keyvaluecache": "^1.0.1", "@cerc-io/nitro-node": "^0.1.13", - "@cerc-io/peer": "^0.2.63", - "@cerc-io/solidity-mapper": "^0.2.63", + "@cerc-io/peer": "^0.2.64", + "@cerc-io/solidity-mapper": "^0.2.64", "@cerc-io/ts-channel": "1.0.3-ts-nitro-0.1.1", "@ethersproject/properties": "^5.7.0", "@ethersproject/providers": "^5.4.4", @@ -51,7 +51,7 @@ "yargs": "^17.0.1" }, "devDependencies": { - "@cerc-io/cache": "^0.2.63", + "@cerc-io/cache": "^0.2.64", "@nomiclabs/hardhat-waffle": "^2.0.1", "@types/bunyan": "^1.8.8", "@types/express": "^4.17.14", From d99bc5fc4380df23172c3f11c49961e415da6563 Mon Sep 17 00:00:00 2001 From: Nabarun Date: Thu, 12 Oct 2023 11:37:13 +0530 Subject: [PATCH 2/3] Comment CI workflow to publish docker image --- .github/workflows/on-main.yaml | 36 +++++++++++++++++----------------- .github/workflows/on-pr.yaml | 16 +++++++-------- .github/workflows/publish.yaml | 36 +++++++++++++++++----------------- 3 files changed, 44 insertions(+), 44 deletions(-) diff --git a/.github/workflows/on-main.yaml b/.github/workflows/on-main.yaml index 609334986..2c4fad83e 100644 --- a/.github/workflows/on-main.yaml +++ b/.github/workflows/on-main.yaml @@ -39,21 +39,21 @@ jobs: yarn build yarn test:init yarn test - build: - name: Run docker build - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - name: Get the version - id: vars - run: | - echo ::set-output name=sha::$(echo ${GITHUB_SHA:0:7}) - echo ::set-output name=repo::$(echo ${{ github.repository }}) - - name: Run docker build - run: make docker-build - - name: Tag docker image - run: docker tag ${{steps.vars.outputs.repo}} ghcr.io/${{steps.vars.outputs.repo}}:${{steps.vars.outputs.sha}} - - name: Docker Login - run: echo ${{ secrets.GITHUB_TOKEN }} | docker login ghcr.io -u cerc-io --password-stdin - - name: Docker Push - run: docker push ghcr.io/${{steps.vars.outputs.repo}}:${{steps.vars.outputs.sha}} + # build: + # name: Run docker build + # runs-on: ubuntu-latest + # steps: + # - uses: actions/checkout@v2 + # - name: Get the version + # id: vars + # run: | + # echo ::set-output name=sha::$(echo ${GITHUB_SHA:0:7}) + # echo ::set-output name=repo::$(echo ${{ github.repository }}) + # - name: Run docker build + # run: make docker-build + # - name: Tag docker image + # run: docker tag ${{steps.vars.outputs.repo}} ghcr.io/${{steps.vars.outputs.repo}}:${{steps.vars.outputs.sha}} + # - name: Docker Login + # run: echo ${{ secrets.GITHUB_TOKEN }} | docker login ghcr.io -u cerc-io --password-stdin + # - name: Docker Push + # run: docker push ghcr.io/${{steps.vars.outputs.repo}}:${{steps.vars.outputs.sha}} diff --git a/.github/workflows/on-pr.yaml b/.github/workflows/on-pr.yaml index 7de9aa024..88ba17b48 100644 --- a/.github/workflows/on-pr.yaml +++ b/.github/workflows/on-pr.yaml @@ -36,11 +36,11 @@ jobs: yarn build yarn test:init yarn test - build: - name: Run docker build - runs-on: ubuntu-latest - needs: test - steps: - - uses: actions/checkout@v2 - - name: Run docker build - run: make docker-build + # build: + # name: Run docker build + # runs-on: ubuntu-latest + # needs: test + # steps: + # - uses: actions/checkout@v2 + # - name: Run docker build + # run: make docker-build diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index ef54af6c2..e402c663c 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -3,24 +3,6 @@ on: release: types: [published] jobs: - docker_publish: - name: Push Docker image to Github Hub - runs-on: ubuntu-latest - steps: - - name: Get the version - id: vars - run: | - echo ::set-output name=sha::$(echo ${GITHUB_SHA:0:7}) - echo ::set-output name=tag::$(echo ${GITHUB_REF#refs/tags/}) - - name: Docker Login to Registry - run: echo ${{ secrets.GITHUB_TOKEN }} | docker login ghcr.io -u cerc-io --password-stdin - - name: Docker Pull - run: docker pull ghcr.io/cerc-io/watcher-ts:${{steps.vars.outputs.sha}} - - name: Tag docker image - run: docker tag ghcr.io/cerc-io/watcher-ts:${{steps.vars.outputs.sha}} ghcr.io/cerc-io/watcher-ts:${{steps.vars.outputs.tag}} - - name: Docker Push to Github Hub - run: docker push ghcr.io/cerc-io/watcher-ts:${{steps.vars.outputs.tag}} - npm_publish: runs-on: ubuntu-latest strategy: @@ -49,3 +31,21 @@ jobs: - name: lerna publish run: | yarn lerna publish from-package --no-git-tag-version --yes + + # docker_publish: + # name: Push Docker image to Github Hub + # runs-on: ubuntu-latest + # steps: + # - name: Get the version + # id: vars + # run: | + # echo ::set-output name=sha::$(echo ${GITHUB_SHA:0:7}) + # echo ::set-output name=tag::$(echo ${GITHUB_REF#refs/tags/}) + # - name: Docker Login to Registry + # run: echo ${{ secrets.GITHUB_TOKEN }} | docker login ghcr.io -u cerc-io --password-stdin + # - name: Docker Pull + # run: docker pull ghcr.io/cerc-io/watcher-ts:${{steps.vars.outputs.sha}} + # - name: Tag docker image + # run: docker tag ghcr.io/cerc-io/watcher-ts:${{steps.vars.outputs.sha}} ghcr.io/cerc-io/watcher-ts:${{steps.vars.outputs.tag}} + # - name: Docker Push to Github Hub + # run: docker push ghcr.io/cerc-io/watcher-ts:${{steps.vars.outputs.tag}} From a9da66eb53e89b5e3e74ab32a5e9f0d162687e50 Mon Sep 17 00:00:00 2001 From: Nabarun Date: Thu, 12 Oct 2023 11:38:59 +0530 Subject: [PATCH 3/3] Update CI workflow names --- .github/workflows/on-main.yaml | 2 +- .github/workflows/on-pr.yaml | 2 +- .github/workflows/publish.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/on-main.yaml b/.github/workflows/on-main.yaml index 2c4fad83e..67d14c8fe 100644 --- a/.github/workflows/on-main.yaml +++ b/.github/workflows/on-main.yaml @@ -1,4 +1,4 @@ -name: Docker Compose Build +name: Lint & Test on: push: diff --git a/.github/workflows/on-pr.yaml b/.github/workflows/on-pr.yaml index 88ba17b48..f8f2dded4 100644 --- a/.github/workflows/on-pr.yaml +++ b/.github/workflows/on-pr.yaml @@ -1,4 +1,4 @@ -name: Docker Build +name: Lint & Test on: [pull_request] diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index e402c663c..7a2a612fe 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -1,4 +1,4 @@ -name: Publish Docker image +name: Publish packages on: release: types: [published]