Skip to content

Commit

Permalink
fix: Remove all rebase logic from CI (#11293)
Browse files Browse the repository at this point in the history
  • Loading branch information
sspaink authored Jun 13, 2022
1 parent 9d17145 commit 42e339f
Showing 1 changed file with 0 additions and 9 deletions.
9 changes: 0 additions & 9 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,6 @@ commands:
check-changed-files-or-halt:
steps:
- run: ./scripts/check-file-changes.sh
rebase-on-master:
steps:
- run: |
git config --global user.email "telegraf@influxdb.com"
git config --global user.name "telegraf"
git remote add upstream https://github.com/influxdata/telegraf
git fetch upstream
git rebase upstream/master
test-go:
parameters:
os:
Expand All @@ -62,7 +54,6 @@ commands:
steps:
- checkout
- check-changed-files-or-halt
- rebase-on-master
- when:
condition:
equal: [ linux, << parameters.os >> ]
Expand Down

0 comments on commit 42e339f

Please sign in to comment.