Skip to content

Commit

Permalink
Remove references to ingester
Browse files Browse the repository at this point in the history
  • Loading branch information
j16r committed Sep 17, 2020
1 parent 600dd82 commit b055353
Show file tree
Hide file tree
Showing 8 changed files with 9 additions and 66 deletions.
22 changes: 0 additions & 22 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -507,10 +489,6 @@ workflows:
filters:
tags:
only: /^v.*/
- build-publish-ingester:
filters:
tags:
only: /^v.*/
- reportcoverage:
requires:
- core-go-test
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/changelog.yml
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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 }}
Expand All @@ -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?"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/static.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tools/bin/lint
Original file line number Diff line number Diff line change
Expand Up @@ -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 ./...
2 changes: 0 additions & 2 deletions tools/ci/push_image
Original file line number Diff line number Diff line change
Expand Up @@ -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/<image>:circleci is the image
Expand All @@ -21,7 +20,6 @@ set -ex
# test-cypress-job-server
# test-external-adapter
# test-echo-server
# ingester
#

if [ -z "$DOCKERHUB_PASS" ]
Expand Down
16 changes: 0 additions & 16 deletions tools/docker/docker-compose.ingester.yaml

This file was deleted.

17 changes: 0 additions & 17 deletions tools/docker/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit b055353

Please sign in to comment.