diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml index 1c70638..b55801b 100644 --- a/.github/workflows/automerge.yml +++ b/.github/workflows/automerge.yml @@ -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 @@ -24,4 +18,4 @@ jobs: name: automerge uses: "pascalgn/automerge-action@v0.15.6" env: - GITHUB_TOKEN: "${{ secrets.AUTOMERGE_TOKEN }}" + GITHUB_TOKEN: "${{ secrets.AUTOMERGE_TOKEN }}" \ No newline at end of file diff --git a/azure-pipelines.yml b/azure-pipelines.yml index bda49e9..db5228a 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -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"