Addressed PR comments

Author: mahasv

src/main/java/pl/project13/core/GitCommitPropertyConstant.java

@@ -108,14 +108,15 @@ public class GitCommitPropertyConstant {
    *
    * Currently supported CIs:
    * <ul>
+   *   <li>AWS CodeBuild</li>
+   *   <li>Azure DevOps</li>
    *   <li>Bamboo</li>
+   *   <li>Bitbucket Pipelines</li>
+   *   <li>GitHub Actions</li>
+   *   <li>Gitlab CI (Gitlab &gt;8.10 &amp; Gitlab CI &gt;0.5)</li>
    *   <li>Hudson/Jenkins</li>
    *   <li>TeamCity</li>
    *   <li>Travis</li>
-   *   <li>Gitlab CI (Gitlab &gt;8.10 &amp; Gitlab CI &gt;0.5)</li>
-   *   <li>Azure DevOps</li>
-   *   <li>AWS CodeBuild</li>
-   *   <li>Bitbucket Pipelines</li>
    * </ul>
    */
   public static final String BUILD_NUMBER = "build.number";
@@ -127,10 +128,11 @@ public class GitCommitPropertyConstant {
    *
    * Currently supported CIs:
    * <ul>
-   *     <li>TeamCity</li>
-   *     <li>Travis</li>
-   *     <li>Gitlab CI (Gitlab &gt;11.0)</li>
-   *     <li>AWS CodeBuild</li>
+   *   <li>AWS CodeBuild</li>
+   *   <li>Gitlab CI (Gitlab &gt;11.0)</li>
+   *   <li>GitHub Actions</li>
+   *   <li>TeamCity</li>
+   *   <li>Travis</li>
    * </ul>
    */
   public static final String BUILD_NUMBER_UNIQUE = "build.number.unique";

src/main/java/pl/project13/core/cibuild/GitHubBuildServerData.java

@@ -40,9 +40,12 @@ public static boolean isActiveServer(Map<String, String> env) {
 
   @Override
   void loadBuildNumber(@Nonnull Properties properties) {
-    String buildNumber = env.getOrDefault("GITHUB_RUN_NUMBER", "");
+    String runId = env.getOrDefault("GITHUB_RUN_ID", "0");
+    String runNumber = env.getOrDefault("GITHUB_RUN_NUMBER", "0");
+    String runAttempt = env.getOrDefault("GITHUB_RUN_ATTEMPT", "0");
 
-    maybePut(properties, GitCommitPropertyConstant.BUILD_NUMBER, () -> buildNumber);
+    maybePut(properties, GitCommitPropertyConstant.BUILD_NUMBER, () -> String.join(".", runNumber, runAttempt));
+    maybePut(properties, GitCommitPropertyConstant.BUILD_NUMBER_UNIQUE, () -> String.join(".", runId, runNumber, runAttempt));
   }
 
   @Override

src/test/java/pl/project13/core/cibuild/BuildServerDataProviderTest.java

@@ -49,23 +49,28 @@ void shouldVerifyOnGithubEnvironment() {
     @Test
     void shouldLoadBuildNumber() {
       Properties properties = new Properties();
-      Map<String, String> environment = Map.of("GITHUB_RUN_NUMBER", "123");
+      Map<String, String> environment = Map.of(
+          "GITHUB_RUN_ID", "1658821493",
+          "GITHUB_RUN_NUMBER", "123",
+          "GITHUB_RUN_ATTEMPT", "1");
       GitHubBuildServerData provider = new GitHubBuildServerData(new DummyLogInterface(), environment);
 
       provider.loadBuildNumber(properties);
 
-      assertThat(properties).containsEntry(GitCommitPropertyConstant.BUILD_NUMBER, "123");
+      assertThat(properties).containsEntry(GitCommitPropertyConstant.BUILD_NUMBER, "123.1");
+      assertThat(properties).containsEntry(GitCommitPropertyConstant.BUILD_NUMBER_UNIQUE, "1658821493.123.1");
     }
 
     @Test
-    void shouldLoadBuildNumberAsEmptyIfNotAvailable() {
+    void shouldLoadBuildNumberAsZerosIfNotAvailable() {
       Properties properties = new Properties();
       Map<String, String> environment = Map.of();
       GitHubBuildServerData provider = new GitHubBuildServerData(new DummyLogInterface(), environment);
 
       provider.loadBuildNumber(properties);
 
-      assertThat(properties).containsEntry(GitCommitPropertyConstant.BUILD_NUMBER, "");
+      assertThat(properties).containsEntry(GitCommitPropertyConstant.BUILD_NUMBER, "0.0");
+      assertThat(properties).containsEntry(GitCommitPropertyConstant.BUILD_NUMBER_UNIQUE, "0.0.0");
     }
 
     @Test