chore: update pull request with master when running CI (#10993)
This commit is contained in:
parent
96be484f08
commit
368b448f2b
|
|
@ -37,6 +37,14 @@ commands:
|
||||||
check-changed-files-or-halt:
|
check-changed-files-or-halt:
|
||||||
steps:
|
steps:
|
||||||
- run: ./scripts/check-file-changes.sh
|
- 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:
|
test-go:
|
||||||
parameters:
|
parameters:
|
||||||
os:
|
os:
|
||||||
|
|
@ -54,6 +62,7 @@ commands:
|
||||||
steps:
|
steps:
|
||||||
- checkout
|
- checkout
|
||||||
- check-changed-files-or-halt
|
- check-changed-files-or-halt
|
||||||
|
- rebase-on-master
|
||||||
- when:
|
- when:
|
||||||
condition:
|
condition:
|
||||||
equal: [ linux, << parameters.os >> ]
|
equal: [ linux, << parameters.os >> ]
|
||||||
|
|
@ -131,6 +140,7 @@ commands:
|
||||||
steps:
|
steps:
|
||||||
- checkout
|
- checkout
|
||||||
- check-changed-files-or-halt
|
- check-changed-files-or-halt
|
||||||
|
- rebase-on-master
|
||||||
- attach_workspace:
|
- attach_workspace:
|
||||||
at: '/go'
|
at: '/go'
|
||||||
- when:
|
- when:
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue