Skip to content

Commit

Permalink
Merge pull request #44 from mietzen/update-ci
Browse files Browse the repository at this point in the history
Update ci
  • Loading branch information
mietzen authored Mar 3, 2024
2 parents 7bc9b44 + 2e8b432 commit a96af6b
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/auto-merge-dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ jobs:
- uses: actions/create-github-app-token@v1
id: generate-token
with:
app_id: ${{ secrets.APP_ID }}
private_key: ${{ secrets.APP_PRIVATE_KEY }}
app-id: ${{ secrets.APP_ID }}
private-key: ${{ secrets.APP_PRIVATE_KEY }}
- uses: peter-evans/enable-pull-request-automerge@v3
with:
token: ${{ steps.generate-token.outputs.token }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/auto-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:

jobs:
auto-release:
if: github.event.pull_request.merged == true && github.event.pull_request.user.login == 'dependabot[bot]'
if: github.event.pull_request.merged == true && github.event.pull_request.user.login == 'dependabot[bot]' && contains(github.event.pull_request.labels.*.name, 'docker')
name: "Auto Release"
runs-on: "ubuntu-latest"
steps:
Expand All @@ -18,8 +18,8 @@ jobs:
- uses: actions/create-github-app-token@v1
id: generate-token
with:
app_id: ${{ secrets.APP_ID }}
private_key: ${{ secrets.APP_PRIVATE_KEY }}
app-id: ${{ secrets.APP_ID }}
private-key: ${{ secrets.APP_PRIVATE_KEY }}
- uses: "softprops/action-gh-release@v1"
with:
token: ${{ steps.generate-token.outputs.token }}
Expand Down

0 comments on commit a96af6b

Please sign in to comment.