From e87d0742be053e30133929e88e19b5a655d7642f Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Fri, 30 May 2025 18:29:13 +0200 Subject: [PATCH] workflows/eval: use consistent naming with the other 3 PR workflows The overall idea is to use names short enough to fit into the status checks list without shortening. This change mostly happened in the commits before, here we just follow the same pattern for the remaining workflows. (cherry picked from commit c08b86e962a69868205a8936c9326634f1c43c05) --- .github/workflows/eval.yml | 10 ++++------ .github/workflows/labels.yml | 5 ++--- .github/workflows/reviewers.yml | 1 - 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml index 5649e01df5b5..f7ce71e4dde1 100644 --- a/.github/workflows/eval.yml +++ b/.github/workflows/eval.yml @@ -14,7 +14,6 @@ defaults: jobs: prepare: - name: Prepare runs-on: ubuntu-24.04-arm outputs: mergedSha: ${{ steps.get-merge-commit.outputs.mergedSha }} @@ -35,14 +34,14 @@ jobs: run: | echo "systems=$(jq -c > "$GITHUB_OUTPUT" - outpaths: - name: Outpaths + eval: runs-on: ubuntu-24.04-arm needs: [prepare] strategy: fail-fast: false matrix: system: ${{ fromJSON(needs.prepare.outputs.systems) }} + name: ${{ matrix.system }} steps: - name: Enable swap run: | @@ -147,9 +146,8 @@ jobs: path: diff/* compare: - name: Comparison runs-on: ubuntu-24.04-arm - needs: [prepare, outpaths] + needs: [prepare, eval] if: needs.prepare.outputs.targetSha permissions: issues: write # needed to create *new* labels @@ -248,7 +246,7 @@ jobs: # No dependency on "compare", so that it can start at the same time. # We only wait for the "comparison" artifact to be available, which makes the start-to-finish time # for the eval workflow considerably faster. - needs: [prepare, outpaths] + needs: [prepare, eval] if: needs.prepare.outputs.targetSha uses: ./.github/workflows/reviewers.yml secrets: diff --git a/.github/workflows/labels.yml b/.github/workflows/labels.yml index 0beb1296f518..2a632be28b57 100644 --- a/.github/workflows/labels.yml +++ b/.github/workflows/labels.yml @@ -3,7 +3,7 @@ # access to the GitHub API. This means that it should not evaluate user input in # a way that allows code injection. -name: "Label PR" +name: Labels on: schedule: @@ -33,8 +33,7 @@ defaults: shell: bash jobs: - labels: - name: label-pr + update: runs-on: ubuntu-24.04-arm if: github.event_name != 'schedule' || github.repository_owner == 'NixOS' steps: diff --git a/.github/workflows/reviewers.yml b/.github/workflows/reviewers.yml index b79e3a589250..4beb755e2b64 100644 --- a/.github/workflows/reviewers.yml +++ b/.github/workflows/reviewers.yml @@ -26,7 +26,6 @@ defaults: jobs: request: - name: Request runs-on: ubuntu-24.04-arm steps: - name: Check out the PR at the base commit