From 7b1dab40d5e75d8fc6d5f7f568a74cc20873906d Mon Sep 17 00:00:00 2001 From: Michael Shaw Date: Fri, 16 Sep 2022 11:03:28 -0400 Subject: [PATCH] cleaning up more vulcanize refs in ci/cd --- .github/workflows/on-pr-publish.yaml | 10 +++++----- .github/workflows/tests.yaml | 8 ++++---- Makefile | 2 +- pkg/eth/ipld_retriever.go | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/on-pr-publish.yaml b/.github/workflows/on-pr-publish.yaml index ff98f2a6..79bf4b78 100644 --- a/.github/workflows/on-pr-publish.yaml +++ b/.github/workflows/on-pr-publish.yaml @@ -47,11 +47,11 @@ jobs: - name: Run docker build run: make docker-build - name: Tag docker image - run: docker tag vulcanize/ipld-eth-server docker.pkg.github.com/vulcanize/ipld-eth-server/ipld-eth-server:${{steps.vars.outputs.sha}} + run: docker tag cerc-io/ipld-eth-server docker.pkg.github.com/cerc-io/ipld-eth-server/ipld-eth-server:${{steps.vars.outputs.sha}} - name: Docker Login run: echo ${{ secrets.GITHUB_TOKEN }} | docker login https://docker.pkg.github.com -u vulcanize --password-stdin - name: Docker Push - run: docker push docker.pkg.github.com/vulcanize/ipld-eth-server/ipld-eth-server:${{steps.vars.outputs.sha}} + run: docker push docker.pkg.github.com/cerc-io/ipld-eth-server/ipld-eth-server:${{steps.vars.outputs.sha}} push_to_registries: name: Push Docker image to Docker Hub @@ -70,10 +70,10 @@ jobs: - name: Docker Login to Github Registry run: echo ${{ secrets.GITHUB_TOKEN }} | docker login https://docker.pkg.github.com -u vulcanize --password-stdin - name: Docker Pull - run: docker pull docker.pkg.github.com/vulcanize/ipld-eth-server/ipld-eth-server:${{steps.vars.outputs.sha}} + run: docker pull docker.pkg.github.com/cerc-io/ipld-eth-server/ipld-eth-server:${{steps.vars.outputs.sha}} - name: Docker Login to Docker Registry run: echo ${{ secrets.VULCANIZEJENKINS_PAT }} | docker login -u vulcanizejenkins --password-stdin - name: Tag docker image - run: docker tag docker.pkg.github.com/vulcanize/ipld-eth-server/ipld-eth-server:${{steps.vars.outputs.sha}} vulcanize/ipld-eth-server:${{steps.vars.outputs.tag}} + run: docker tag docker.pkg.github.com/cerc-io/ipld-eth-server/ipld-eth-server:${{steps.vars.outputs.sha}} cerc-io/ipld-eth-server:${{steps.vars.outputs.tag}} - name: Docker Push to Docker Hub - run: docker push vulcanize/ipld-eth-server:${{steps.vars.outputs.tag}} + run: docker push cerc-io/ipld-eth-server:${{steps.vars.outputs.tag}} diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 9046321d..fcb0c353 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -102,12 +102,12 @@ jobs: - uses: actions/checkout@v2 with: ref: ${{ inputs.GO_ETHEREUM_REF }} - repository: vulcanize/go-ethereum + repository: cerc-io/go-ethereum path: "./go-ethereum/" - uses: actions/checkout@v2 with: ref: ${{ inputs.IPLD_ETH_DB_REF }} - repository: vulcanize/ipld-eth-db + repository: cerc-io/ipld-eth-db path: "./ipld-eth-db/" - name: Create config file run: | @@ -170,12 +170,12 @@ jobs: - uses: actions/checkout@v2 with: ref: ${{ inputs.GO_ETHEREUM_REF }} - repository: vulcanize/go-ethereum + repository: cerc-io/go-ethereum path: "./go-ethereum/" - uses: actions/checkout@v2 with: ref: ${{ inputs.IPLD_ETH_DB_REF }} - repository: vulcanize/ipld-eth-db + repository: cerc-io/ipld-eth-db path: "./ipld-eth-db/" - name: Create config file run: | diff --git a/Makefile b/Makefile index a45346a4..8d99d56a 100644 --- a/Makefile +++ b/Makefile @@ -135,4 +135,4 @@ import: ## Build docker image .PHONY: docker-build docker-build: - docker build -t vulcanize/ipld-eth-server . + docker build -t cerc-io/ipld-eth-server . diff --git a/pkg/eth/ipld_retriever.go b/pkg/eth/ipld_retriever.go index 053a2da4..217ab563 100644 --- a/pkg/eth/ipld_retriever.go +++ b/pkg/eth/ipld_retriever.go @@ -20,10 +20,10 @@ import ( "fmt" "strconv" + "github.com/cerc-io/ipld-eth-server/v4/pkg/shared" "github.com/ethereum/go-ethereum/statediff/trie_helpers" sdtypes "github.com/ethereum/go-ethereum/statediff/types" "github.com/jmoiron/sqlx" - "github.com/cerc-io/ipld-eth-server/v4/pkg/shared" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/crypto" @@ -33,7 +33,7 @@ import ( const ( // node type removed value. - // https://github.com/vulcanize/go-ethereum/blob/271f4d01e7e2767ffd8e0cd469bf545be96f2a84/statediff/indexer/helpers.go#L34 + // https://github.com/cerc-io/go-ethereum/blob/271f4d01e7e2767ffd8e0cd469bf545be96f2a84/statediff/indexer/helpers.go#L34 removedNode = 3 RetrieveHeadersByHashesPgStr = `SELECT cid, data