workflows/eval: consistently avoid "result" in arguments

Everything is a result, especially when nix-build uses "result" as its
default output. This becomes confusing, when re-wiring the different
parts later.

Thus, consistently name those things after some of their properties and
avoid the term result.
This commit is contained in:
Wolfgang Walther 2025-05-18 21:21:44 +02:00
parent 0e1c284b13
commit b2579d36ff
No known key found for this signature in database
GPG key ID: B39893FA5F65CAE1
3 changed files with 31 additions and 30 deletions

View file

@ -74,14 +74,15 @@ jobs:
run: |
nix-build untrusted/ci -A eval.singleSystem \
--argstr evalSystem "$MATRIX_SYSTEM" \
--arg chunkSize 10000
--arg chunkSize 10000 \
--out-link merged
# If it uses too much memory, slightly decrease chunkSize
- name: Upload the output paths and eval stats
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
with:
name: intermediate-${{ matrix.system }}
path: result/*
name: merged-${{ matrix.system }}
path: merged/*
process:
name: Process
@ -93,8 +94,8 @@ jobs:
- name: Download output paths and eval stats for all systems
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
with:
pattern: intermediate-*
path: intermediate
pattern: merged-*
path: merged
merge-multiple: true
- name: Check out the PR at the test merge commit
@ -111,14 +112,14 @@ jobs:
- name: Combine all output paths and eval stats
run: |
nix-build untrusted/ci -A eval.combine \
--arg resultsDir ./intermediate \
-o prResult
--arg evalDir ./merged \
--out-link combined
- name: Upload the combined results
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
with:
name: result
path: prResult/*
name: combined
path: combined/*
- name: Get target run id
if: needs.prepare.outputs.targetSha
@ -156,8 +157,8 @@ jobs:
- uses: actions/download-artifact@v4
if: steps.targetRunId.outputs.targetRunId
with:
name: result
path: targetResult
name: combined
path: target
merge-multiple: true
github-token: ${{ github.token }}
run-id: ${{ steps.targetRunId.outputs.targetRunId }}
@ -174,15 +175,15 @@ jobs:
# Use the target branch to get accurate maintainer info
nix-build trusted/ci -A eval.compare \
--arg beforeResultDir ./targetResult \
--arg afterResultDir "$(realpath prResult)" \
--arg beforeDir ./target \
--arg afterDir "$(realpath combined)" \
--arg touchedFilesJson ./touched-files.json \
--argstr githubAuthorId "$AUTHOR_ID" \
-o comparison
--out-link comparison
cat comparison/step-summary.md >> "$GITHUB_STEP_SUMMARY"
- name: Upload the combined results
- name: Upload the comparison results
if: steps.targetRunId.outputs.targetRunId
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
with:
@ -211,7 +212,7 @@ jobs:
permission-members: read
permission-pull-requests: write
- name: Download process result
- name: Download comparison result
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
with:
name: comparison