diff --git a/.github/dependabot.yml b/.github/dependabot.yml index da3aede..36469b1 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -11,7 +11,7 @@ updates: prefix: 'deps' # packaged dependencies prefix-development: 'build' # dev-dependencies #include: 'scope' - rebase-strategy: 'auto' + # rebase-strategy: 'auto' # use default schedule: interval: 'daily' - package-ecosystem: 'github-actions' # See documentation for possible values @@ -20,6 +20,6 @@ updates: prefix: 'ci' #include: 'scope' # Scope will be handled by the auto-merge action - rebase-strategy: 'auto' + # rebase-strategy: 'auto' # use default schedule: interval: 'daily' diff --git a/.github/workflows/dependabot-approve-and-auto-merge.yml b/.github/workflows/dependabot-approve-and-auto-merge.yml index a3cf0f1..46fa4d4 100644 --- a/.github/workflows/dependabot-approve-and-auto-merge.yml +++ b/.github/workflows/dependabot-approve-and-auto-merge.yml @@ -34,14 +34,12 @@ jobs: title_pt1="${TITLE%%:*}" gh pr checkout "$PR_URL" # sets the upstream metadata for `gh pr status` packagename="${{ steps.dependabot-fetch.outputs.dependency-names }}" - #echo "packagename is $packagename" - #echo "$title_pt1" - #echo "$title_pt2" parensOpen="(" parensClose="):" pr_title=$title_pt1$parensOpen$packagename$parensClose$title_pt2 echo "FINAL TITLE: $pr_title" gh pr edit "$PR_URL" --title "$pr_title" + gh pr edit "$PR_URL" --add-label "dependabot" # Auto merge Dependabot PRs for: # - patch updates on prod dependencies @@ -63,10 +61,10 @@ jobs: if: | ( steps.dependabot.outputs.update-type == 'version-update:semver-patch' && - contains('direct:production,indirect:production', steps.dependabot.outputs.dependency-type) + contains('production', steps.dependabot.outputs.dependency-type) ) || ( contains('version-update:semver-minor,version-update:semver-patch', steps.dependabot.outputs.update-type) && - contains('direct:development,indirect:development', steps.dependabot.outputs.dependency-type) + contains('development', steps.dependabot.outputs.dependency-type) ) run: echo "::notice ::auto-merge conditions satisfied"