Skip to content

Commit

Permalink
Merge branch 'main' into dothanhl/feature/depreacate_warning_legacy_t…
Browse files Browse the repository at this point in the history
…elemetry
  • Loading branch information
Gnol-VN authored May 16, 2024
2 parents e4cdfb3 + 5bb6cbb commit 21b01bf
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions .github/pipelines/github-forward.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ variables:
- name: system.debug
value: false
- group: OmexOpenSourceExternal-VG
- group: OmexAcTokens
- group: OmexAcTokensCorpNet
resources:
repositories:
- repository: OfficePipelineTemplates
Expand Down Expand Up @@ -88,5 +88,5 @@ extends:
SkipIfNoChangesFound: false
WorkItemId: "8430180"
AutoCompleteUserId: 75d3c7a0-2045-6bf0-b50e-3ab2cf9ae644
Pat: $(OfficeOcCodeAccess)
Pat: $(OfficeOcCodeAccessCorpNet)
MergeStrategy: noFastForward
6 changes: 3 additions & 3 deletions .github/pipelines/github-reverse.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ variables:
- name: system.debug
value: false
- group: OmexOpenSourceInternal-VG
- group: OmexAcTokens
- group: OmexAcTokensCorpNet
resources:
repositories:
- repository: self
Expand Down Expand Up @@ -48,7 +48,7 @@ extends:
targetType: inline
script: |-
Write-Host "GITBRANCH being used: '$env:GITBRANCH'"
$url = "https://omexac:{0}@dev.azure.com/office/OC/_git/OmexGitHubInternal" -f $env:OfficeOcCodeAccess
$url = "https://omexac:{0}@dev.azure.com/office/OC/_git/OmexGitHubInternal" -f $env:OfficeOcCodeAccessCorpNet
git remote add omexgithubinternalremote $url
git fetch omexgithubinternalremote
Expand All @@ -67,7 +67,7 @@ extends:
Write-Host "##vso[task.setvariable variable=ChangesFound]$ChangesFound"
env:
OfficeOcCodeAccess: $(OfficeOcCodeAccess)
OfficeOcCodeAccessCorpNet: $(OfficeOcCodeAccessCorpNet)
- task: oenginternal.office-vsts-tasks-extension.e881ce1e-41bc-4f59-b8a2-9a6001f43efe.CreatePullRequest@10
displayName: Create Pull Request
condition: and(succeeded(), ne(variables['ChangesFound'], 0))
Expand Down
4 changes: 2 additions & 2 deletions .github/pipelines/github-webhook.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ variables:
value: any cpu
- name: system.debug
value: false
- group: OmexAcTokens
- group: OmexAcTokensCorpNet
schedules:
- cron: 0 1 * * 2
branches:
Expand Down Expand Up @@ -89,4 +89,4 @@ extends:
failOnStderr: true
showWarnings: true
env:
PAT: $(OfficeOcCodeAccess)
PAT: $(OfficeOcCodeAccessCorpNet)

0 comments on commit 21b01bf

Please sign in to comment.