Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/pip/certifi-2024.8.30
Browse files Browse the repository at this point in the history
  • Loading branch information
cvetkovic authored Oct 15, 2024
2 parents 3bde400 + 4b79e05 commit 876411e
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 2 deletions.
25 changes: 25 additions & 0 deletions .github/workflows/enable-auto-merge.yml
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions pkg/driver/trace_driver_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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++ {
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 876411e

Please sign in to comment.