diff --git a/.github/workflows/enable-auto-merge.yml b/.github/workflows/enable-auto-merge.yml new file mode 100644 index 000000000..11b1e1acf --- /dev/null +++ b/.github/workflows/enable-auto-merge.yml @@ -0,0 +1,25 @@ +name: Enable automerge on dependabot PRs + +on: + # See note below about using pull_request_target + pull_request_target: + +jobs: + automerge: + name: Enable automerge on dependabot PRs + runs-on: ubuntu-latest + steps: + - name: Enable automerge on dependabot PRs + uses: daneden/enable-automerge-action@v1 + with: + # A personal access token that you have generated and saved in the + # repo or org’s encrypted secrets + github-token: ${{ secrets.ENABLE_AUTOMERGE_TOKEN }} + + # The name of the PR author to enable automerge for + # Defaults to dependabot[bot] + allowed-author: "dependabot[bot]" + + # Allowed values: MERGE | SQUASH | REBASE + # Defaults to MERGE + merge-method: REBASE \ No newline at end of file diff --git a/pkg/driver/trace_driver_test.go b/pkg/driver/trace_driver_test.go index ee8515bca..418ec0e56 100644 --- a/pkg/driver/trace_driver_test.go +++ b/pkg/driver/trace_driver_test.go @@ -281,7 +281,7 @@ func TestGlobalMetricsCollector(t *testing.T) { var record []metric.ExecutionRecord err = gocsv.UnmarshalFile(f, &record) if err != nil { - log.Fatalf(err.Error()) + log.Fatal(err.Error()) } for i := 0; i < driver.Configuration.Functions[0].InvocationStats.Invocations[0]; i++ { @@ -372,7 +372,7 @@ func TestDriverCompletely(t *testing.T) { var records []metric.ExecutionRecordBase err = gocsv.UnmarshalFile(f, &records) if err != nil { - log.Fatalf(err.Error()) + log.Fatal(err.Error()) } successfulInvocation, failedInvocations := 0, 0