From 7118ccafa95916267c2160cdaf12b4be95e1f6b2 Mon Sep 17 00:00:00 2001 From: Subhrodip Mohanta Date: Fri, 28 Aug 2020 12:17:38 +0530 Subject: [PATCH 1/6] Update maven-ci.yml Removed if clause for building code in main codebase from the CI pipeline. --- .github/workflows/maven-ci.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/maven-ci.yml b/.github/workflows/maven-ci.yml index 9281c0f3d..304953bc9 100644 --- a/.github/workflows/maven-ci.yml +++ b/.github/workflows/maven-ci.yml @@ -49,14 +49,10 @@ jobs: ${{ runner.os }}-maven- # Some tests need screen access - name: Install xvfb - run: sudo apt-get install xvfb + run: sudo apt-get install -y xvfb # SonarQube scan does not work for forked repositories # See https://jira.sonarsource.com/browse/MMF-1371 - - name: Build with Maven - if: github.ref != 'refs/heads/master' - run: xvfb-run mvn clean verify - name: Build with Maven and run SonarQube analysis - if: github.ref == 'refs/heads/master' run: xvfb-run mvn clean verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar env: # These two env variables are needed for sonar analysis From 47e746c3bae4ebfd7a422b99f923458940067d58 Mon Sep 17 00:00:00 2001 From: Subhrodip Mohanta Date: Fri, 28 Aug 2020 12:26:27 +0530 Subject: [PATCH 2/6] Update maven-pr-builder.yml removed the if checking block for building Pull Requests as this was redundant code. --- .github/workflows/maven-pr-builder.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/maven-pr-builder.yml b/.github/workflows/maven-pr-builder.yml index 7e4f3670f..8ef817687 100644 --- a/.github/workflows/maven-pr-builder.yml +++ b/.github/workflows/maven-pr-builder.yml @@ -49,9 +49,8 @@ jobs: ${{ runner.os }}-maven- # Some tests need screen access - name: Install xvfb - run: sudo apt-get install xvfb + run: sudo apt-get install -y xvfb # SonarQube scan does not work for forked repositories # See https://jira.sonarsource.com/browse/MMF-1371 - name: Build with Maven - if: github.ref != 'refs/heads/master' run: xvfb-run mvn clean verify From 8135dbecdba26c93aad9d40dbee67f2fadd63167 Mon Sep 17 00:00:00 2001 From: Subhrodip Mohanta Date: Sat, 29 Aug 2020 17:36:31 +0530 Subject: [PATCH 3/6] Update maven-ci.yml --- .github/workflows/maven-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/maven-ci.yml b/.github/workflows/maven-ci.yml index 304953bc9..cb3b8e45c 100644 --- a/.github/workflows/maven-ci.yml +++ b/.github/workflows/maven-ci.yml @@ -50,7 +50,8 @@ jobs: # Some tests need screen access - name: Install xvfb run: sudo apt-get install -y xvfb - # SonarQube scan does not work for forked repositories + # The SonarQube analysis is only for the master branch of the main repository. + # SonarQube scan does not work for forked repositories try changing it to xvfb-run mvn clean verify # See https://jira.sonarsource.com/browse/MMF-1371 - name: Build with Maven and run SonarQube analysis run: xvfb-run mvn clean verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar From 338c146c7888d368177c50808ea581bf3e42aa45 Mon Sep 17 00:00:00 2001 From: Subhrodip Mohanta Date: Sat, 29 Aug 2020 17:39:50 +0530 Subject: [PATCH 4/6] Update maven-pr-builder.yml --- .github/workflows/maven-pr-builder.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/maven-pr-builder.yml b/.github/workflows/maven-pr-builder.yml index 8ef817687..0c6d624c2 100644 --- a/.github/workflows/maven-pr-builder.yml +++ b/.github/workflows/maven-pr-builder.yml @@ -50,7 +50,8 @@ jobs: # Some tests need screen access - name: Install xvfb run: sudo apt-get install -y xvfb - # SonarQube scan does not work for forked repositories + # This worflow is only for building Pull Requests, the master branch runs Sonar analysis on the main repository. + # SonarQube scan does not work for forked repositories. # See https://jira.sonarsource.com/browse/MMF-1371 - name: Build with Maven run: xvfb-run mvn clean verify From f5886325ec8e07e994f4eeda8d7a4adb1e391f45 Mon Sep 17 00:00:00 2001 From: Subhrodip Mohanta Date: Sat, 29 Aug 2020 19:34:43 +0530 Subject: [PATCH 5/6] Update maven-ci.yml upgraded build server runtime from Ubuntu 18.04 to 20.04 LTS --- .github/workflows/maven-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven-ci.yml b/.github/workflows/maven-ci.yml index cb3b8e45c..19291fa41 100644 --- a/.github/workflows/maven-ci.yml +++ b/.github/workflows/maven-ci.yml @@ -33,7 +33,7 @@ on: jobs: build: - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v2 From 1973d1bc63bc60727b5fdba0dda9070eb66f5cd9 Mon Sep 17 00:00:00 2001 From: Subhrodip Mohanta Date: Sat, 29 Aug 2020 19:35:20 +0530 Subject: [PATCH 6/6] Update maven-pr-builder.yml upgraded build server runtime from Ubuntu 18.04 to 20.04 LTS for the PR builder as well --- .github/workflows/maven-pr-builder.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven-pr-builder.yml b/.github/workflows/maven-pr-builder.yml index 0c6d624c2..f970c0ee5 100644 --- a/.github/workflows/maven-pr-builder.yml +++ b/.github/workflows/maven-pr-builder.yml @@ -33,7 +33,7 @@ on: jobs: build: - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v2