diff --git a/.circleci/config.yml b/.circleci/config.yml index 2257d819205..085dd4dd89d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -338,24 +338,6 @@ jobs: name: Docker push, if applicable command: | tools/ci/push_image "${CIRCLE_BRANCH}" "${CIRCLE_TAG}" test-external-adapter - build-publish-ingester: - resource_class: large - machine: - image: circleci/classic:201808-01 - docker_layer_caching: true - steps: - - checkout - - run: - name: Docker login - command: | - echo "$DOCKERHUB_PASS" | docker login -u "$DOCKERHUB_USER" --password-stdin - - run: - name: Docker build - command: docker build -f ingester/ingester.Dockerfile -t smartcontract/ingester:circleci . - - run: - name: Docker push, if applicable - command: | - tools/ci/push_image "${CIRCLE_BRANCH}" "${CIRCLE_TAG}" ingester reportcoverage: docker: - image: smartcontract/builder:1.0.33 @@ -507,10 +489,6 @@ workflows: filters: tags: only: /^v.*/ - - build-publish-ingester: - filters: - tags: - only: /^v.*/ - reportcoverage: requires: - core-go-test diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml index 805e0aaa9c2..146cce261a9 100644 --- a/.github/workflows/changelog.yml +++ b/.github/workflows/changelog.yml @@ -1,5 +1,5 @@ # -# This action checks PRs to see if any CHANGELOG* files were updated. +# This action checks PRs to see if any CHANGELOG* files were updated. # If none were, it will add a message to the PR asking if it would make sense to do so. # name: Changelog @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Check for changed files - id: changedfiles + id: changedfiles uses: futuratrepadeira/changed-files@186b5b30b1f5e44ed655a59652746c3ce00d53ef # Version v3.1.1 with: repo-token: ${{ secrets.GITHUB_TOKEN }} @@ -21,7 +21,7 @@ jobs: uses: unsplash/comment-on-pr@d1a1d5dd1eb1bb657a01f4d92dd5e4d5bb7857d3 # Version v1.2.0 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - if: + if: contains(steps.changedfiles.outputs.files_updated, 'CHANGELOG') != true && contains(steps.changedfiles.outputs.files_created, 'CHANGELOG') != true with: msg: "I see that you haven't updated any CHANGELOG files. Would it make sense to do so?" diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml index 98eba49d99e..17b4710ce87 100644 --- a/.github/workflows/static.yml +++ b/.github/workflows/static.yml @@ -49,7 +49,7 @@ jobs: - uses: actions/setup-go@v2 - uses: actions/checkout@v2 - run: go get -v github.com/securego/gosec/cmd/gosec - - run: $HOME/go/bin/gosec -exclude=G101,G104,G204,G304 -exclude-dir ingester ./... + - run: $HOME/go/bin/gosec -exclude=G101,G104,G204,G304 ./... lint: name: lint runs-on: ubuntu-latest diff --git a/.github/workflows/sync-develop-from-smartcontractkit-chainlink.yml b/.github/workflows/sync-develop-from-smartcontractkit-chainlink.yml index be5f9ae29b6..c3f77e6622d 100644 --- a/.github/workflows/sync-develop-from-smartcontractkit-chainlink.yml +++ b/.github/workflows/sync-develop-from-smartcontractkit-chainlink.yml @@ -14,16 +14,16 @@ jobs: - uses: actions/checkout@v2 with: ref: develop - if: env.GITHUB_REPOSITORY != 'smartcontractkit/chainlink' + if: env.GITHUB_REPOSITORY != 'smartcontractkit/chainlink' - name: Sync run: | git remote add upstream "https://github.com/smartcontractkit/chainlink.git" COMMIT_HASH_UPSTREAM=$(git ls-remote upstream develop | grep -P '^[0-9a-f]{40}\trefs/heads/develop$' | cut -f 1) - COMMIT_HASH_ORIGIN=$(git ls-remote origin develop | grep -P '^[0-9a-f]{40}\trefs/heads/develop$' | cut -f 1) - if [ "$COMMIT_HASH_UPSTREAM" = "$COMMIT_HASH_ORIGIN" ]; then + COMMIT_HASH_ORIGIN=$(git ls-remote origin develop | grep -P '^[0-9a-f]{40}\trefs/heads/develop$' | cut -f 1) + if [ "$COMMIT_HASH_UPSTREAM" = "$COMMIT_HASH_ORIGIN" ]; then echo "Both remotes have develop at $COMMIT_HASH_UPSTREAM. No need to sync." else - echo "upstream has develop at $COMMIT_HASH_UPSTREAM. origin has develop at $COMMIT_HASH_ORIGIN. Syncing..." + echo "upstream has develop at $COMMIT_HASH_UPSTREAM. origin has develop at $COMMIT_HASH_ORIGIN. Syncing..." git fetch upstream git push origin upstream/develop:develop fi diff --git a/tools/bin/lint b/tools/bin/lint index 6686e88ea0b..b3d3263127d 100755 --- a/tools/bin/lint +++ b/tools/bin/lint @@ -15,6 +15,6 @@ staticcheck ./... echo "errcheck" errcheck -ignoretests -asserts -ignoregenerated ./... echo "gosec" -gosec -exclude=G101,G104,G204,G304 -exclude-dir ingester ./... +gosec -exclude=G101,G104,G204,G304 -./... echo "golint" golint -min_confidence 1 ./... diff --git a/tools/ci/push_image b/tools/ci/push_image index e13f8726bed..9984607f113 100755 --- a/tools/ci/push_image +++ b/tools/ci/push_image @@ -10,7 +10,6 @@ set -ex # ie: # push_image master 0.6.9 integration # push_image develop echo_server -# push_image release/0.6.9 ingester # # Ignores anything not matching above. # Key assumption: local version of smartcontract/:circleci is the image @@ -21,7 +20,6 @@ set -ex # test-cypress-job-server # test-external-adapter # test-echo-server -# ingester # if [ -z "$DOCKERHUB_PASS" ] diff --git a/tools/docker/docker-compose.ingester.yaml b/tools/docker/docker-compose.ingester.yaml deleted file mode 100644 index 42f7a121087..00000000000 --- a/tools/docker/docker-compose.ingester.yaml +++ /dev/null @@ -1,16 +0,0 @@ -version: '3.5' - -services: - ingester: - container_name: ingester - image: chainlink/ingester - build: - context: ../../ - dockerfile: ingester/ingester.Dockerfile - restart: always - environment: - - ETH_CHAIN_ID - - ETH_URL - depends_on: - - node - - explorer diff --git a/tools/docker/docker-compose.yaml b/tools/docker/docker-compose.yaml index fd54e466f14..d04f33acfc3 100644 --- a/tools/docker/docker-compose.yaml +++ b/tools/docker/docker-compose.yaml @@ -79,23 +79,6 @@ services: POSTGRES_DB: $EXPLORER_DB_NAME POSTGRES_PASSWORD: $EXPLORER_PGPASSWORD - ingester: - container_name: chainlink-ingester - image: chainlink/ingester - build: - context: ../../ - dockerfile: ingester/ingester.Dockerfile - restart: always - depends_on: - - explorer-db - environment: - - ETH_CHAIN_ID - - ETH_URL - - DB_HOST=$INGESTER_DB_HOST - - DB_NAME=$EXPLORER_DB_NAME - - DB_PORT=$EXPLORER_DB_PORT - - DB_USERNAME=$INGESTER_DB_USERNAME - - DB_PASSWORD=$EXPLORER_PGPASSWORD # TODO # - replace clroot with secrets # - extract explorer and tools into separate docker-compose files