Removed the id from github actions CI step and job values/links and improved code grouping

Author: ribafish

src/main/java/com/gradle/CustomBuildScanEnhancements.java

@@ -304,12 +304,12 @@ public void execute(BuildResultAdapter buildResult) {
                     addCustomValueAndSearchLink(develocity, "CI workflow", value));
                 envVariable("GITHUB_RUN_ID", providers).ifPresent(value ->
                     addCustomValueAndSearchLink(develocity, "CI run", value));
-                envVariable("GITHUB_HEAD_REF", providers).filter(value -> !value.isEmpty()).ifPresent(value ->
-                    buildScan.value("PR branch", value));
                 envVariable("GITHUB_ACTION", providers).ifPresent(value ->
-                        addCustomValueAndSearchLink(develocity, "CI step id", value));
+                        addCustomValueAndSearchLink(develocity, "CI step", value));
                 envVariable("GITHUB_JOB", providers).ifPresent(value ->
-                        addCustomValueAndSearchLink(develocity, "CI job id", value));
+                        addCustomValueAndSearchLink(develocity, "CI job", value));
+                envVariable("GITHUB_HEAD_REF", providers).filter(value -> !value.isEmpty()).ifPresent(value ->
+                        buildScan.value("PR branch", value));
             }
 
             if (isGitLab(providers)) {