Skip to content

Commit c48b990

Browse files
authored
More ack fixes (#174)
1 parent e1d2008 commit c48b990

File tree

3 files changed

+6
-10
lines changed

3 files changed

+6
-10
lines changed

.github/workflows/ack.yml

+4-8
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@ jobs:
2727
# either title, body or source branch name. We ignore potential failure
2828
# of this step.
2929
- name: Auto-add labels
30+
if: |
31+
github.event.action == "opened" &&
32+
!contains(fromJSON('["bug", "feature", "skip-changelog", "minor", "enhancement"]'), github.event.issue.labels.*.name)
3033
uses: release-drafter/release-drafter@v6
3134
with:
3235
# we only want to use the auto-labeler bits:
@@ -73,16 +76,9 @@ jobs:
7376
# label-operator: NOT
7477

7578
# https://docs.github.com/en/code-security/dependabot/working-with-dependabot/automating-dependabot-with-github-actions#approve-a-pull-request
76-
- name: Dependabot metadata
77-
if: github.actor == 'dependabot[bot]'
78-
id: metadata
79-
uses: dependabot/fetch-metadata@v1
80-
with:
81-
github-token: "${{ secrets.GITHUB_TOKEN }}"
82-
8379
- name: Enable auto-merge for safe bots PRs
8480
if: contains(fromJson('["dependabot[bot]", "pre-commit-ci[bot]"]'), github.actor)
85-
run: gh pr merge --auto --merge "$PR_URL"
81+
run: gh pr merge --auto --squash "$PR_URL"
8682
env:
8783
PR_URL: ${{github.event.pull_request.html_url}}
8884
GH_TOKEN: ${{secrets.GITHUB_TOKEN}}

docs/guides/mentoring.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,4 +38,4 @@ The mentorship program should also help you improve collaboration with other ope
3838
- Check if you have enough available time to invest in that. It would not be unreasonable to assume that at least **4h/week** would be needed for at least few months.
3939
- Be sure you mention what you aim to gain from that experience, what areas you want to focus on.
4040

41-
At the moment this was written, both [`ssbarnea`](https://github.com/ssbarnea) and [`ganeshrn`](https://github.com/ganeshrn) may be able to accept a mentee. You should also post a message on https://github.com/ansible/devtools/discussions/81
41+
At the moment this was written, both [`ssbarnea`](https://github.com/ssbarnea) and [`ganeshrn`](https://github.com/ganeshrn) may be able to accept a mentee. You should also post a message on https://github.com/ansible/team-devtools/discussions/81

mkdocs.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ theme:
1313
extra:
1414
social:
1515
- icon: fontawesome/brands/github-alt
16-
link: https://github.com/ansible/devtools
16+
link: https://github.com/ansible/team-devtools
1717
nav:
1818
- home: index.md
1919
- guides:

0 commit comments

Comments
 (0)