Skip to content

Commit

Permalink
Merge pull request #47 from cloudsteak/demo
Browse files Browse the repository at this point in the history
Új kapcsolat azonosító
  • Loading branch information
the1bit authored Nov 18, 2024
2 parents f42b580 + 47fd7a9 commit 1312e80
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 9 deletions.
10 changes: 2 additions & 8 deletions .github/workflows/automerge.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,9 @@
name: automerge
name: Automatikus összefűzés
on:
pull_request:
types:
- labeled
- unlabeled
- synchronize
- opened
- edited
- ready_for_review
- reopened
- unlocked
pull_request_review:
types:
- submitted
Expand All @@ -24,4 +18,4 @@ jobs:
name: automerge
uses: "pascalgn/[email protected]"
env:
GITHUB_TOKEN: "${{ secrets.AUTOMERGE_TOKEN }}"
GITHUB_TOKEN: "${{ secrets.AUTOMERGE_TOKEN }}"
2 changes: 1 addition & 1 deletion azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ resources:

variables:
# Container registry service connection established during pipeline creation
dockerRegistryServiceConnection: "97944d9d-15df-46b7-948e-9679d0437c97"
dockerRegistryServiceConnection: "f4f94a44-0505-4235-9347-4926b8fef7a4"
imageRepository: "trn-node-docker"
containerRegistry: "mentorklub.azurecr.io"
dockerfilePath: "$(Build.SourcesDirectory)/Dockerfile"
Expand Down

0 comments on commit 1312e80

Please sign in to comment.