Skip to content

Commit 8f9ac07

Browse files
qinsoonqinsoon
committed
Extract binding-refs to a separate workflow
1 parent 2017a9b commit 8f9ac07

File tree

3 files changed

+71
-48
lines changed

3 files changed

+71
-48
lines changed

‎.github/workflows/perf-compare-ci.yml‎

Lines changed: 15 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,16 @@ on:
99

1010
jobs:
1111
binding-refs:
12+
uses: ./.github/workflows/pr-binding-refs.yml
13+
with:
14+
pull_request: ${{ github.event.inputs.pull_request }}
15+
16+
mmtk-refs:
1217
runs-on: ubuntu-18.04
1318
outputs:
14-
openjdk_binding_repo: ${{ steps.print.outputs.openjdk_binding_repo }}
15-
openjdk_binding_ref: ${{ steps.print.outputs.openjdk_binding_ref }}
16-
jikesrvm_binding_repo: ${{ steps.print.outputs.jikesrvm_binding_repo }}
17-
jikesrvm_binding_ref: ${{ steps.print.outputs.jikesrvm_binding_ref }}
18-
v8_binding_repo: ${{ steps.print.outputs.v8_binding_repo }}
19-
v8_binding_ref: ${{ steps.print.outputs.v8_binding_ref }}
19+
mmtk_repo: ${{ steps.print.outputs.mmtk_repo }}
20+
mmtk-ref: ${{ steps.print.outputs.mmtk_ref }}
2021
steps:
21-
- name: Check binding revisions
22-
uses: qinsoon/[email protected]
23-
with:
24-
token: ${{ secrets.GITHUB_TOKEN }}
25-
pull_request: ${{ github.event.inputs.pull_request }}
26-
default_env: 'OPENJDK_BINDING_REPO=mmtk/mmtk-openjdk,OPENJDK_BINDING_REF=master,JIKESRVM_BINDING_REPO=mmtk/mmtk-jikesrvm,JIKESRVM_BINDING_REF=master,V8_BINDING_REPO=mmtk/mmtk-v8,V8_BINDING_REF=master'
2722
- name: Get mmtk-core repo from pull_request
2823
uses: actions/github-script@v6
2924
id: core-repo
@@ -50,18 +45,12 @@ jobs:
5045
return res.data.head.sha
5146
- id: print
5247
run: |
53-
echo "::set-output name=openjdk_binding_repo::${{ env.OPENJDK_BINDING_REPO }}"
54-
echo "::set-output name=openjdk_binding_ref::${{ env.OPENJDK_BINDING_REF }}"
55-
echo "::set-output name=jikesrvm_binding_repo::${{ env.JIKESRVM_BINDING_REPO }}"
56-
echo "::set-output name=jikesrvm_binding_ref::${{ env.JIKESRVM_BINDING_REF }}"
57-
echo "::set-output name=v8_binding_repo::${{ env.V8_BINDING_REPO }}"
58-
echo "::set-output name=v8_binding_ref::${{ env.V8_BINDING_REF }}"
59-
echo "::set-output name=mmtk-repo::${{ steps.core-repo.outputs.result }}"
60-
echo "::set-output name=mmtk-ref::${{ steps.core-ref.outputs.result }}"
48+
echo "::set-output name=mmtk_repo::${{ steps.core-repo.outputs.result }}"
49+
echo "::set-output name=mmtk_ref::${{ steps.core-ref.outputs.result }}"
6150
6251
jikesrvm-perf-compare:
6352
runs-on: [self-hosted, Linux, freq-scaling-off]
64-
needs: binding-refs
53+
needs: [binding-refs, mmtk-refs]
6554
steps:
6655
# - name: Check Revisions
6756
# uses: qinsoon/[email protected]
@@ -101,8 +90,8 @@ jobs:
10190
- name: Checkout MMTk Core
10291
uses: actions/checkout@v2
10392
with:
104-
repository: ${{ needs.binding-refs.outputs.mmtk_repo }}
105-
ref: ${{ needs.binding-refs.outputs.mmtk_ref }}
93+
repository: ${{ needs.mmtk-refs.outputs.mmtk_repo }}
94+
ref: ${{ needs.mmtk-refs.outputs.mmtk_ref }}
10695
path: mmtk-core-branch
10796
- name: Checkout JikesRVM for Branch
10897
working-directory: mmtk-jikesrvm-branch
@@ -171,7 +160,7 @@ jobs:
171160
172161
openjdk-perf-compare:
173162
runs-on: [self-hosted, Linux, freq-scaling-off]
174-
needs: binding-refs
163+
needs: [binding-refs, mmtk-refs]
175164
steps:
176165
# - run: echo "PERF_PR=${{ github.event.inputs.pull_request }}" >> $GITHUB_ENV
177166
# - name: Check Revisions
@@ -216,8 +205,8 @@ jobs:
216205
- name: Checkout MMTk Core
217206
uses: actions/checkout@v2
218207
with:
219-
repository: ${{ needs.binding-refs.outputs.mmtk_repo }}
220-
ref: ${{ needs.binding-refs.outputs.mmtk_ref }}
208+
repository: ${{ needs.mmtk-refs.outputs.mmtk_repo }}
209+
ref: ${{ needs.mmtk-refs.outputs.mmtk_ref }}
221210
path: mmtk-core-branch
222211
# checkout perf-kit
223212
- name: Checkout Perf Kit

‎.github/workflows/post-review-ci.yml‎

Lines changed: 3 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -8,29 +8,10 @@ on:
88

99
jobs:
1010
binding-refs:
11-
runs-on: ubuntu-18.04
1211
if: contains(github.event.pull_request.labels.*.name, 'PR-testing')
13-
outputs:
14-
openjdk_binding_repo: ${{ steps.print.outputs.openjdk_binding_repo }}
15-
openjdk_binding_ref: ${{ steps.print.outputs.openjdk_binding_ref }}
16-
jikesrvm_binding_repo: ${{ steps.print.outputs.jikesrvm_binding_repo }}
17-
jikesrvm_binding_ref: ${{ steps.print.outputs.jikesrvm_binding_ref }}
18-
v8_binding_repo: ${{ steps.print.outputs.v8_binding_repo }}
19-
v8_binding_ref: ${{ steps.print.outputs.v8_binding_ref }}
20-
steps:
21-
- name: Check binding revisions
22-
uses: qinsoon/[email protected]
23-
with:
24-
token: ${{ secrets.GITHUB_TOKEN }}
25-
default_env: 'OPENJDK_BINDING_REPO=mmtk/mmtk-openjdk,OPENJDK_BINDING_REF=master,JIKESRVM_BINDING_REPO=mmtk/mmtk-jikesrvm,JIKESRVM_BINDING_REF=master,V8_BINDING_REPO=mmtk/mmtk-v8,V8_BINDING_REF=master'
26-
- id: print
27-
run: |
28-
echo "::set-output name=openjdk_binding_repo::${{ env.OPENJDK_BINDING_REPO }}"
29-
echo "::set-output name=openjdk_binding_ref::${{ env.OPENJDK_BINDING_REF }}"
30-
echo "::set-output name=jikesrvm_binding_repo::${{ env.JIKESRVM_BINDING_REPO }}"
31-
echo "::set-output name=jikesrvm_binding_ref::${{ env.JIKESRVM_BINDING_REF }}"
32-
echo "::set-output name=v8_binding_repo::${{ env.V8_BINDING_REPO }}"
33-
echo "::set-output name=v8_binding_ref::${{ env.V8_BINDING_REF }}"
12+
uses: ./.github/workflows/pr-binding-refs.yml
13+
with:
14+
pull_request: ${{ github.event.pull_request.number }}
3415

3516
openjdk-binding-test:
3617
runs-on: ubuntu-18.04

‎.github/workflows/pr-binding-refs.yml‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
name: Fetch Binding PR Info
2+
3+
on:
4+
workflow_call:
5+
inputs:
6+
pull_request:
7+
type: string
8+
required: true
9+
outputs:
10+
openjdk_binding_repo:
11+
description: "The repository of OpenJDK binding, such as {user}/{repo}"
12+
value: ${{ jobs.binding-refs.outputs.openjdk_binding_repo}}
13+
openjdk_binding_ref:
14+
description: "The git ref of OpenJDK binding, such as sha and branch name"
15+
value: ${{ jobs.binding-refs.outputs.openjdk_binding_ref}}
16+
jikesrvm_binding_repo:
17+
description: "The repository of JikesRVM binding, such as {user}/{repo}"
18+
value: ${{ jobs.binding-refs.outputs.jikesrvm_binding_repo}}
19+
jikesrvm_binding_ref:
20+
description: "The git ref of JikesRVM binding, such as sha and branch name"
21+
value: ${{ jobs.binding-refs.outputs.jikesrvm_binding_ref}}
22+
v8_binding_repo:
23+
description: "The repository of V8 binding, such as {user}/{repo}"
24+
value: ${{ jobs.binding-refs.outputs.v8_binding_repo}}
25+
v8_binding_ref:
26+
description: "The git ref of V8 binding, such as sha and branch name"
27+
value: ${{ jobs.binding-refs.outputs.v8_binding_ref}}
28+
29+
jobs:
30+
binding-refs:
31+
runs-on: ubuntu-18.04
32+
outputs:
33+
openjdk_binding_repo: ${{ steps.print.outputs.openjdk_binding_repo }}
34+
openjdk_binding_ref: ${{ steps.print.outputs.openjdk_binding_ref }}
35+
jikesrvm_binding_repo: ${{ steps.print.outputs.jikesrvm_binding_repo }}
36+
jikesrvm_binding_ref: ${{ steps.print.outputs.jikesrvm_binding_ref }}
37+
v8_binding_repo: ${{ steps.print.outputs.v8_binding_repo }}
38+
v8_binding_ref: ${{ steps.print.outputs.v8_binding_ref }}
39+
steps:
40+
- name: Check binding revisions
41+
uses: qinsoon/[email protected]
42+
with:
43+
pull_request: ${{ inputs.pull_request }}
44+
token: ${{ secrets.GITHUB_TOKEN }}
45+
default_env: 'OPENJDK_BINDING_REPO=mmtk/mmtk-openjdk,OPENJDK_BINDING_REF=master,JIKESRVM_BINDING_REPO=mmtk/mmtk-jikesrvm,JIKESRVM_BINDING_REF=master,V8_BINDING_REPO=mmtk/mmtk-v8,V8_BINDING_REF=master'
46+
- id: print
47+
run: |
48+
echo "::set-output name=openjdk_binding_repo::${{ env.OPENJDK_BINDING_REPO }}"
49+
echo "::set-output name=openjdk_binding_ref::${{ env.OPENJDK_BINDING_REF }}"
50+
echo "::set-output name=jikesrvm_binding_repo::${{ env.JIKESRVM_BINDING_REPO }}"
51+
echo "::set-output name=jikesrvm_binding_ref::${{ env.JIKESRVM_BINDING_REF }}"
52+
echo "::set-output name=v8_binding_repo::${{ env.V8_BINDING_REPO }}"
53+
echo "::set-output name=v8_binding_ref::${{ env.V8_BINDING_REF }}"

0 commit comments

Comments
 (0)