Skip to content

Commit 3f30563

Browse files
committed
Debug perf compare config
1 parent 83ac46c commit 3f30563

File tree

2 files changed

+41
-29
lines changed

2 files changed

+41
-29
lines changed

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

Lines changed: 38 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ on:
1010
jobs:
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,20 +30,22 @@ 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+
console.log(JSON.stringify(res, null, '\t'))
39+
return "test"
3940
- name: Get mmtk-core refs from pull_request
4041
uses: actions/github-script@v6
4142
id: core-ref
4243
with:
4344
result-encoding: string
4445
script: |
4546
return (await github.rest.pulls.get({
46-
owner: mmtk,
47-
repo: mmtk-core,
47+
owner: "mmtk",
48+
repo: "mmtk-core",
4849
pull_number: ${{ github.event.inputs.pull_request }}
4950
})).head.sha
5051
- id: print
@@ -74,7 +75,9 @@ jobs:
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-
uses: qinsoon/[email protected]
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+
# uses: qinsoon/[email protected]
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

.github/workflows/perf-regression-ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ on:
88
# READ BEFORE ENABLING THE TRIGGER BELOW
99
# This trigger is only used when testing the scripts in a branch, and should be commented out in other cases.
1010
# If this trigger is used, please change the following env: RESULT_REPO_BRANCH -> 'test' (MUST), DEPLOY -> 'false' (optional)
11-
pull_request:
12-
branches:
13-
- master
11+
# pull_request:
12+
# branches:
13+
# - master
1414

1515
env:
1616
# The branch to save run data and plot graph from. Use 'self-hosted' for master, use 'test' or anything else for testing in a branch.

0 commit comments

Comments
 (0)