|
60 | 60 | REAL_TIME_BENCHMARK: |
61 | 61 | name: REAL_TIME_BENCHMARK |
62 | 62 | if: github.repository == 'php/php-src' || github.event_name == 'workflow_dispatch' |
63 | | - runs-on: ubuntu-22.04 |
| 63 | + runs-on: ubuntu-24.04 |
64 | 64 | env: |
65 | 65 | REPOSITORY: ${{ github.repository }} |
66 | 66 | BRANCH: "master" |
|
82 | 82 | echo "YEAR=$YEAR" >> $GITHUB_ENV |
83 | 83 |
|
84 | 84 | if [ "${{ github.event_name }}" = "workflow_dispatch" ]; then |
85 | | - PR_INFO=$(gh pr view ${{ inputs.pull_request }} --json headRepositoryOwner,headRepository,headRefName,headRefOid,baseRefOid --repo ${{ github.repository }} | jq -r '.headRepositoryOwner.login, .headRepository.name, .headRefName, .headRefOid, .baseRefOid') |
| 85 | + PR_INFO=$(gh pr view ${{ inputs.pull_request }} --json headRepositoryOwner,headRepository,headRefName,headRefOid,baseRefName --repo ${{ github.repository }} | jq -r '.headRepositoryOwner.login, .headRepository.name, .headRefName, .headRefOid, .baseRefName') |
86 | 86 |
|
87 | 87 | REPOSITORY="$(echo "$PR_INFO" | sed -n '1p')/$(echo "$PR_INFO" | sed -n '2p')" |
88 | 88 | echo "REPOSITORY=$REPOSITORY" >> $GITHUB_ENV |
|
93 | 93 | COMMIT=$(echo "$PR_INFO" | sed -n '4p') |
94 | 94 | echo "COMMIT=$COMMIT" >> $GITHUB_ENV |
95 | 95 |
|
96 | | - BASELINE_COMMIT=$(echo "$PR_INFO" | sed -n '5p') |
| 96 | + BASELINE_BRANCH=$(echo "$PR_INFO" | sed -n '5p') |
| 97 | +
|
| 98 | + BASELINE_COMMIT=$(gh api /repos/${{ github.repository }}/compare/$BASELINE_BRANCH...$COMMIT --jq '.merge_base_commit.sha') |
97 | 99 | echo "BASELINE_COMMIT=$BASELINE_COMMIT" >> $GITHUB_ENV |
98 | 100 |
|
99 | 101 | echo "ID=benchmarked" >> $GITHUB_ENV |
@@ -288,12 +290,14 @@ jobs: |
288 | 290 | fi |
289 | 291 | git commit -m "Add result for ${{ github.repository }}@${{ github.sha }}" |
290 | 292 | git push |
291 | | - - name: Upload artifact |
| 293 | + - name: Upload artifacts |
292 | 294 | if: github.event_name == 'workflow_dispatch' |
293 | 295 | uses: actions/upload-artifact@v6 |
294 | 296 | with: |
295 | 297 | name: results |
296 | | - path: ./php-version-benchmarks/docs/results/${{ env.YEAR }} |
| 298 | + path: | |
| 299 | + ./php-version-benchmarks/tmp/results/${{ env.YEAR }}/*/*.* |
| 300 | + ./php-version-benchmarks/tmp/results/${{ env.YEAR }}/*/*/*.log |
297 | 301 | retention-days: 30 |
298 | 302 | - name: Comment results |
299 | 303 | if: github.event_name == 'workflow_dispatch' |
|
0 commit comments