Skip to content

Commit 60a4341

Browse files
eng, fix submodule ci (#3159)
* fail if commit id not found * use PR ID as input * rename to ci-submodule-pull-request.yaml
1 parent 12ec7d3 commit 60a4341

File tree

7 files changed

+34
-33
lines changed

7 files changed

+34
-33
lines changed

eng/pipelines/ci-submodule-commit.yaml

Lines changed: 0 additions & 18 deletions
This file was deleted.
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
trigger: none
2+
pr: none
3+
4+
parameters:
5+
- name: SubmodulePullRequestId
6+
displayName: 'Pull Request ID of the Submodule'
7+
type: string
8+
9+
jobs:
10+
- template: /eng/pipelines/jobs/build-autorest.yml
11+
parameters:
12+
SubmodulePullRequestId: ${{ parameters.SubmodulePullRequestId }}
13+
- template: /eng/pipelines/jobs/build-autorest-mgmt.yml
14+
parameters:
15+
SubmodulePullRequestId: ${{ parameters.SubmodulePullRequestId }}
16+
- template: /eng/pipelines/jobs/build-typespec.yml
17+
parameters:
18+
SubmodulePullRequestId: ${{ parameters.SubmodulePullRequestId }}

eng/pipelines/jobs/build-autorest-mgmt.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
parameters:
2-
- name: SubmoduleCommit
2+
- name: SubmodulePullRequestId
33
type: string
44
default: ''
55

@@ -21,10 +21,10 @@ jobs:
2121
- checkout: self
2222
submodules: true
2323

24-
- ${{ if ne(parameters.SubmoduleCommit, '') }} :
24+
- ${{ if ne(parameters.SubmodulePullRequestId, '') }} :
2525
- template: /eng/pipelines/steps/update-submodule-commit.yml
2626
parameters:
27-
SubmoduleCommit: ${{ parameters.SubmoduleCommit }}
27+
SubmodulePullRequestId: ${{ parameters.SubmodulePullRequestId }}
2828

2929
- script: |
3030
git checkout .

eng/pipelines/jobs/build-autorest.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
parameters:
2-
- name: SubmoduleCommit
2+
- name: SubmodulePullRequestId
33
type: string
44
default: ''
55

@@ -21,10 +21,10 @@ jobs:
2121
- checkout: self
2222
submodules: true
2323

24-
- ${{ if ne(parameters.SubmoduleCommit, '') }} :
24+
- ${{ if ne(parameters.SubmodulePullRequestId, '') }} :
2525
- template: /eng/pipelines/steps/update-submodule-commit.yml
2626
parameters:
27-
SubmoduleCommit: ${{ parameters.SubmoduleCommit }}
27+
SubmodulePullRequestId: ${{ parameters.SubmodulePullRequestId }}
2828

2929
- script: |
3030
git checkout .

eng/pipelines/jobs/build-typespec.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
parameters:
2-
- name: SubmoduleCommit
2+
- name: SubmodulePullRequestId
33
type: string
44
default: ''
55
- name: UploadSpectorReport
@@ -23,4 +23,4 @@ jobs:
2323
steps:
2424
- template: /eng/pipelines/steps/build-typespec.yml
2525
parameters:
26-
SubmoduleCommit: ${{ parameters.SubmoduleCommit }}
26+
SubmodulePullRequestId: ${{ parameters.SubmodulePullRequestId }}

eng/pipelines/steps/build-typespec.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ steps:
22
- checkout: self
33
submodules: true
44

5-
- ${{ if ne(parameters.SubmoduleCommit, '') }} :
5+
- ${{ if ne(parameters.SubmodulePullRequestId, '') }} :
66
- template: /eng/pipelines/steps/update-submodule-commit.yml
77
parameters:
8-
SubmoduleCommit: ${{ parameters.SubmoduleCommit }}
8+
SubmodulePullRequestId: ${{ parameters.SubmodulePullRequestId }}
99

1010
- task: NodeTool@0
1111
displayName: 'Install Node.js $(NodeVersion)'
Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
parameters:
2-
- name: SubmoduleCommit
2+
- name: SubmodulePullRequestId
33
type: string
44

55
steps:
66
- script: |
7+
set -e
78
cd core
8-
git pull --unshallow
9-
git checkout ${{ parameters.SubmoduleCommit }}
9+
git fetch origin pull/${{ parameters.SubmodulePullRequestId }}/head:pull_${{ parameters.SubmodulePullRequestId }}_head
10+
git checkout pull_${{ parameters.SubmodulePullRequestId }}_head
1011
cd ..
1112
git add core
12-
git commit -m 'update core to commit ${{ parameters.SubmoduleCommit }}'
13-
displayName: 'Update Submodule to Commit ${{ parameters.SubmoduleCommit }}'
13+
git commit -m 'update core to head of PR ${{ parameters.SubmodulePullRequestId }}'
14+
displayName: 'Update Submodule to Pull Request ID ${{ parameters.SubmodulePullRequestId }}'

0 commit comments

Comments
 (0)