1010jobs :
1111 binding-refs :
1212 runs-on : ubuntu-18.04
13- if : contains(github.event.pull_request.labels.*.name, 'PR-testing')
1413 outputs :
1514 openjdk_binding_repo : ${{ steps.print.outputs.openjdk_binding_repo }}
1615 openjdk_binding_ref : ${{ steps.print.outputs.openjdk_binding_ref }}
@@ -31,22 +30,24 @@ jobs:
3130 with :
3231 result-encoding : string
3332 script : |
34- return (await github.rest.pulls.get({
35- owner: mmtk,
36- repo: mmtk-core,
33+ var res = (await github.rest.pulls.get({
34+ owner: " mmtk" ,
35+ repo: " mmtk-core" ,
3736 pull_number: ${{ github.event.inputs.pull_request }}
38- })).head.repo.full_name
37+ }))
38+ return res.data.head.repo.full_name
3939 - name : Get mmtk-core refs from pull_request
4040 uses : actions/github-script@v6
4141 id : core-ref
4242 with :
4343 result-encoding : string
4444 script : |
45- return (await github.rest.pulls.get({
46- owner: mmtk,
47- repo: mmtk-core,
45+ var res = (await github.rest.pulls.get({
46+ owner: " mmtk" ,
47+ repo: " mmtk-core" ,
4848 pull_number: ${{ github.event.inputs.pull_request }}
49- })).head.sha
49+ }))
50+ return res.data.head.sha
5051 - id : print
5152 run : |
5253 echo "::set-output name=openjdk_binding_repo::${{ env.OPENJDK_BINDING_REPO }}"
7475 uses : actions/checkout@v2
7576 with :
7677 repository : mmtk/mmtk-jikesrvm
77- ref : master
78+ # Do not commit this
79+ ref : remove-vm-submodule
80+ # ref: master
7881 path : mmtk-jikesrvm-trunk
7982 - name : Checkout JikesRVM for Trunk
8083 working-directory : mmtk-jikesrvm-trunk
@@ -109,6 +112,7 @@ jobs:
109112 uses : actions/checkout@v2
110113 with :
111114 repository : mmtk/ci-perf-kit
115+ token : ${{ secrets.CI_ACCESS_TOKEN }}
112116 ref : " 0.6.6"
113117 path : ci-perf-kit
114118 submodules : true
@@ -167,52 +171,60 @@ jobs:
167171
168172 openjdk-perf-compare :
169173 runs-on : [self-hosted, Linux, freq-scaling-off]
174+ needs : binding-refs
170175 steps :
171- - run : echo "PERF_PR=${{ github.event.inputs.pull_request }}" >> $GITHUB_ENV
172- - name : Check Revisions
173- 174- with :
175- token : ${{ secrets.GITHUB_TOKEN }}
176- pull_request : ${{ env.PERF_PR }}
177- default_env : ' OPENJDK_BINDING_TRUNK_REF=master,MMTK_CORE_TRUNK_REF=master,OPENJDK_BINDING_BRANCH_REF=master,MMTK_CORE_BRANCH_REF=${{ github.event.pull_request.head.sha }}'
176+ # - run: echo "PERF_PR=${{ github.event.inputs.pull_request }}" >> $GITHUB_ENV
177+ # - name: Check Revisions
178+ 179+ # with:
180+ # token: ${{ secrets.GITHUB_TOKEN }}
181+ # pull_request: ${{ env.PERF_PR }}
182+ # default_env: 'OPENJDK_BINDING_TRUNK_REF=master,MMTK_CORE_TRUNK_REF=master,OPENJDK_BINDING_BRANCH_REF=master,MMTK_CORE_BRANCH_REF=${{ github.event.pull_request.head.sha }}'
178183 # Trunk
179184 # - binding
180185 - name : Checkout OpenJDK Binding Trunk
181186 uses : actions/checkout@v2
182187 with :
183- repository : mmtk/mmtk-openjdk
184- token : ${{ secrets.GITHUB_TOKEN }}
188+ # Do not commit this
189+ repository : qinsoon/mmtk-openjdk
190+ ref : remove-vm-submodule
191+ # repository: mmtk/mmtk-openjdk
192+ # ref: master
185193 path : mmtk-openjdk-trunk
186- submodules : true
187- ref : ${{ env.OPENJDK_BINDING_TRUNK_REF }}
194+ - name : Checkout OpenJDK for Trunk
195+ working-directory : mmtk-openjdk-trunk
196+ run : ./.github/scripts/ci-checkout.sh
188197 # -core
189198 - name : Checkout MMTk Core
190199 uses : actions/checkout@v2
191200 with :
192- ref : ${{ env.MMTK_CORE_TRUNK_REF }}
201+ repository : mmtk/mmtk-core
202+ ref : master
193203 path : mmtk-core-trunk
194204 # Branch
195205 # - binding
196206 - name : Checkout OpenJDK Binding Branch
197207 uses : actions/checkout@v2
198208 with :
199- repository : mmtk/mmtk-openjdk
200- token : ${{ secrets.GITHUB_TOKEN }}
209+ repository : ${{ needs.binding-refs.outputs.openjdk_binding_repo }}
210+ ref : ${{ needs.binding-refs.outputs.openjdk_binding_ref }}
201211 path : mmtk-openjdk-branch
202- submodules : true
203- ref : ${{ env.OPENJDK_BINDING_BRANCH_REF }}
212+ - name : Checkout OpenJDK for Branch
213+ working-directory : mmtk-openjdk-branch
214+ run : ./.github/scripts/ci-checkout.sh
204215 # - core
205216 - name : Checkout MMTk Core
206217 uses : actions/checkout@v2
207218 with :
208- ref : ${{ env.MMTK_CORE_BRANCH_REF }}
219+ repository : ${{ needs.binding-refs.outputs.mmtk_repo }}
220+ ref : ${{ needs.binding-refs.outputs.mmtk_ref }}
209221 path : mmtk-core-branch
210222 # checkout perf-kit
211223 - name : Checkout Perf Kit
212224 uses : actions/checkout@v2
213225 with :
214226 repository : mmtk/ci-perf-kit
215- token : ${{ secrets.GITHUB_TOKEN }}
227+ token : ${{ secrets.CI_ACCESS_TOKEN }}
216228 ref : " 0.6.6"
217229 path : ci-perf-kit
218230 submodules : true
0 commit comments