Skip to content

Commit ddc62b3

Browse files
authored
Create new workflow for weekly retagger
- Create new workflow for weekly retagger job - Run retagger merge from different platforms - Exports a tar archive containing 4 diff_reports file, one/platform
2 parents 05a62d4 + 6c60fd7 commit ddc62b3

File tree

4 files changed

+58
-31
lines changed

4 files changed

+58
-31
lines changed

.github/workflows/ci-matrix-gen.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,11 @@ on:
77
type: string
88
description: Job selection (Python regex)
99
required: false
10+
workflow_call:
11+
inputs:
12+
jobs_to_run:
13+
required: true
14+
type: string
1015
pull_request:
1116
types: [review_requested, ready_for_review]
1217
schedule:
Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
name: Run Weekly unittest retagger
2+
on:
3+
schedule:
4+
- cron: '0 0 * * 1'
5+
workflow_dispatch:
6+
7+
jobs:
8+
run-retagger:
9+
uses: ./.github/workflows/ci-matrix-gen.yml
10+
with:
11+
jobs_to_run: python-svm-build-gate-linux|python-unittest-retagger-gate
12+
13+
merge_all_reports:
14+
runs-on: ubuntu-latest
15+
needs: run-retagger
16+
if: ${{ success() }}
17+
steps:
18+
19+
- name: Actions/Checkout
20+
uses: actions/checkout@main
21+
with:
22+
path: main
23+
24+
- name: Download reports
25+
uses: actions/download-artifact@v5
26+
with:
27+
pattern: python-unittest-retagger*
28+
merge-multiple: true
29+
continue-on-error: true
30+
31+
- name: Merge retagger reports
32+
working-directory: main
33+
run: |
34+
mkdir -p ../retagger-reports ../diffs
35+
ls && ls ..
36+
mv retagger-report*.json ../retagger-reports
37+
38+
declare -a os_list=("linux-x86_64" "linux-aarch64" "darwin-x86_64" "windows-x86_64")
39+
for os in "${os_list[@]}"; do
40+
echo "Merging tags for $os"
41+
python3 .github/scripts/merge_retagger_results.py --dir ../retagger-reports --outfile "../retagger-reports/reports-merged-$os.json" --pattern "*$os*" || true
42+
python3 graalpython/com.oracle.graal.python.test/src/runner.py merge-tags-from-report "../retagger-reports/reports-merged-$os.json" --platform "$os" || true
43+
git diff > "../diffs/reports_diff-$os" || true
44+
done
45+
46+
- name: Export reports diff file
47+
uses: actions/upload-artifact@v5
48+
with:
49+
name: retagger.diff
50+
path: diffs/reports_diff*
51+
retention-days: 15

ci.jsonnet

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -548,37 +548,6 @@
548548
["git", "push", "--force", "origin", "published"],
549549
]
550550
},
551-
{
552-
name: "python-unittest-retagger-merge",
553-
targets: ["tier3"],
554-
capabilities: ["linux", "amd64"],
555-
packages: {
556-
mx: "7.34.1",
557-
python3: "==3.12.8",
558-
},
559-
requireArtifacts: [
560-
{
561-
name: "python-unittest-retagger*",
562-
dir: ".",
563-
}
564-
],
565-
publishArtifacts: [
566-
{
567-
name: "retagger.diff",
568-
dir: ".",
569-
patterns: ["diff_reports"]
570-
}
571-
],
572-
run: [
573-
["mkdir", "-p", "../retagger-reports"],
574-
["sh", "-c", "mv retagger-report*.json ../retagger-reports"],
575-
["cd", "../retagger-reports"],
576-
["python3", "../main/.github/scripts/merge_retagger_results.py"],
577-
["cd", "../main"],
578-
["python3", "./graalpython/com.oracle.graal.python.test/src/runner.py", "merge-tags-from-report", "../retagger-reports/reports-merged.json"],
579-
["sh", "-c", "git diff >> diff_reports"],
580-
]
581-
},
582551
],
583552
}
584553

graalpython/com.oracle.graal.python.test/src/runner.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -451,6 +451,8 @@ def generate_mx_report(self, path: str):
451451
# Some reports may be split when ran on github, this sets different file names
452452
report_suffix = os.environ.get("MX_REPORT_SUFFIX")
453453
if report_suffix:
454+
if os.environ.get("GITHUB_CI"):
455+
report_suffix = f"{report_suffix}_{CURRENT_PLATFORM}"
454456
tmppath, ext = os.path.splitext(path)
455457
path = f"{tmppath}{report_suffix}{ext}"
456458

0 commit comments

Comments
 (0)