From 278d082ed1176bceff4bb51f05abaf4196782ab1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Zu=CC=88hlke?= Date: Mon, 14 Oct 2024 15:37:50 +0200 Subject: [PATCH 1/2] Trying a shorter job name for better display in GHA --- .github/workflows/ci.yml | 2 +- .mergify.yml | 18 +++++++++--------- .../typelevel/sbt/gha/GenerativePlugin.scala | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7c0f2974..6ced66e3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -38,7 +38,7 @@ concurrency: jobs: build: - name: Build and Test + name: CI strategy: matrix: os: [ubuntu-latest, macos-latest, windows-latest] diff --git a/.mergify.yml b/.mergify.yml index 33d41854..cf877e03 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -12,15 +12,15 @@ pull_request_rules: - or: - body~=labels:.*early-semver-patch - body~=labels:.*early-semver-minor - - status-success=Build and Test (ubuntu-latest, 2.12, temurin@8, sbt-typelevelJVM) - - status-success=Build and Test (ubuntu-latest, 2.12, temurin@11, sbt-typelevelJVM) - - status-success=Build and Test (ubuntu-latest, 2.12, temurin@17, sbt-typelevelJVM) - - status-success=Build and Test (ubuntu-latest, 2.12, graal_22.3.2@11, sbt-typelevelJVM) - - status-success=Build and Test (ubuntu-latest, 2.12, graalvm@17, sbt-typelevelJVM) - - status-success=Build and Test (ubuntu-latest, 2.12, corretto@17, sbt-typelevelJVM) - - status-success=Build and Test (ubuntu-latest, 2.12, semeru@17, sbt-typelevelJVM) - - status-success=Build and Test (macos-latest, 2.12, temurin@17, sbt-typelevelJVM) - - status-success=Build and Test (windows-latest, 2.12, temurin@8, sbt-typelevelJVM) + - status-success=CI (ubuntu-latest, 2.12, temurin@8, sbt-typelevelJVM) + - status-success=CI (ubuntu-latest, 2.12, temurin@11, sbt-typelevelJVM) + - status-success=CI (ubuntu-latest, 2.12, temurin@17, sbt-typelevelJVM) + - status-success=CI (ubuntu-latest, 2.12, graal_22.3.2@11, sbt-typelevelJVM) + - status-success=CI (ubuntu-latest, 2.12, graalvm@17, sbt-typelevelJVM) + - status-success=CI (ubuntu-latest, 2.12, corretto@17, sbt-typelevelJVM) + - status-success=CI (ubuntu-latest, 2.12, semeru@17, sbt-typelevelJVM) + - status-success=CI (macos-latest, 2.12, temurin@17, sbt-typelevelJVM) + - status-success=CI (windows-latest, 2.12, temurin@8, sbt-typelevelJVM) - status-success=Validate Steward Config (ubuntu-latest, temurin@11) - status-success=Generate Site (ubuntu-latest, temurin@11) - '#approved-reviews-by>=1' diff --git a/github-actions/src/main/scala/org/typelevel/sbt/gha/GenerativePlugin.scala b/github-actions/src/main/scala/org/typelevel/sbt/gha/GenerativePlugin.scala index 594970e8..6321df0e 100644 --- a/github-actions/src/main/scala/org/typelevel/sbt/gha/GenerativePlugin.scala +++ b/github-actions/src/main/scala/org/typelevel/sbt/gha/GenerativePlugin.scala @@ -834,7 +834,7 @@ ${indent(jobs.map(compileJob(_, sbt)).mkString("\n\n"), 1)} Seq( WorkflowJob( "build", - "Build and Test", + "CI", githubWorkflowJobSetup.value.toList ::: githubWorkflowBuildPreamble.value.toList ::: WorkflowStep.Run( From 67635fe73562680476fb1a6fd0ce02c1489b9fb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Zu=CC=88hlke?= Date: Sun, 20 Oct 2024 23:29:38 +0200 Subject: [PATCH 2/2] use "Test" as job name --- .github/workflows/ci.yml | 2 +- .mergify.yml | 18 +++++++++--------- .../typelevel/sbt/gha/GenerativePlugin.scala | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e481d0f7..b82a3ae2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -38,7 +38,7 @@ concurrency: jobs: build: - name: CI + name: Test strategy: matrix: os: [ubuntu-22.04, macos-latest, windows-latest] diff --git a/.mergify.yml b/.mergify.yml index 2516e4e5..c3af80b8 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -12,15 +12,15 @@ pull_request_rules: - or: - body~=labels:.*early-semver-patch - body~=labels:.*early-semver-minor - - status-success=Build and Test (ubuntu-22.04, 2.12, temurin@8, sbt-typelevelJVM) - - status-success=Build and Test (ubuntu-22.04, 2.12, temurin@11, sbt-typelevelJVM) - - status-success=Build and Test (ubuntu-22.04, 2.12, temurin@17, sbt-typelevelJVM) - - status-success=Build and Test (ubuntu-22.04, 2.12, graal_22.3.2@11, sbt-typelevelJVM) - - status-success=Build and Test (ubuntu-22.04, 2.12, graalvm@21, sbt-typelevelJVM) - - status-success=Build and Test (ubuntu-22.04, 2.12, corretto@17, sbt-typelevelJVM) - - status-success=Build and Test (ubuntu-22.04, 2.12, semeru@17, sbt-typelevelJVM) - - status-success=Build and Test (macos-latest, 2.12, temurin@17, sbt-typelevelJVM) - - status-success=Build and Test (windows-latest, 2.12, temurin@8, sbt-typelevelJVM) + - status-success=Test (ubuntu-22.04, 2.12, temurin@8, sbt-typelevelJVM) + - status-success=Test (ubuntu-22.04, 2.12, temurin@11, sbt-typelevelJVM) + - status-success=Test (ubuntu-22.04, 2.12, temurin@17, sbt-typelevelJVM) + - status-success=Test (ubuntu-22.04, 2.12, graal_22.3.2@11, sbt-typelevelJVM) + - status-success=Test (ubuntu-22.04, 2.12, graalvm@21, sbt-typelevelJVM) + - status-success=Test (ubuntu-22.04, 2.12, corretto@17, sbt-typelevelJVM) + - status-success=Test (ubuntu-22.04, 2.12, semeru@17, sbt-typelevelJVM) + - status-success=Test (macos-latest, 2.12, temurin@17, sbt-typelevelJVM) + - status-success=Test (windows-latest, 2.12, temurin@8, sbt-typelevelJVM) - status-success=Validate Steward Config (ubuntu-22.04, temurin@11) - status-success=Generate Site (ubuntu-22.04, temurin@11) - '#approved-reviews-by>=1' diff --git a/github-actions/src/main/scala/org/typelevel/sbt/gha/GenerativePlugin.scala b/github-actions/src/main/scala/org/typelevel/sbt/gha/GenerativePlugin.scala index 23b0bd70..625809f9 100644 --- a/github-actions/src/main/scala/org/typelevel/sbt/gha/GenerativePlugin.scala +++ b/github-actions/src/main/scala/org/typelevel/sbt/gha/GenerativePlugin.scala @@ -828,7 +828,7 @@ ${indent(jobs.map(compileJob(_, sbt)).mkString("\n\n"), 1)} Seq( WorkflowJob( "build", - "CI", + "Test", githubWorkflowJobSetup.value.toList ::: githubWorkflowBuildPreamble.value.toList ::: WorkflowStep.Run(