fix: Remove all rebase logic from CI (#11293)

influxdata · Jun 13, 2022 · 1c626ca · 1c626ca
1 parent 7fee282
commit 1c626ca
Showing 1 changed file with 0 additions and 9 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -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:
@@ -62,7 +54,6 @@ commands:
     steps:
       - checkout
       - check-changed-files-or-halt
-      - rebase-on-master
       - when:
           condition:
             equal: [ linux, << parameters.os >> ]