From 00d06871f4841b676467bb933d7859713de0f306 Mon Sep 17 00:00:00 2001 From: Subhrodip Mohanta Date: Sun, 16 Aug 2020 12:42:08 +0530 Subject: [PATCH 1/4] updated workflows --- .github/workflows/{maven.yml => maven-ci.yml} | 10 ++- .github/workflows/maven-pr-builder.yml | 64 +++++++++++++++++++ 2 files changed, 71 insertions(+), 3 deletions(-) rename .github/workflows/{maven.yml => maven-ci.yml} (91%) create mode 100644 .github/workflows/maven-pr-builder.yml diff --git a/.github/workflows/maven.yml b/.github/workflows/maven-ci.yml similarity index 91% rename from .github/workflows/maven.yml rename to .github/workflows/maven-ci.yml index d18cad280..914db3f4d 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven-ci.yml @@ -24,13 +24,11 @@ # This workflow will build a Java project with Maven # For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven -name: Java CI with Maven +name: Java CI on: push: branches: [ master ] - pull_request: - branches: [ master ] jobs: build: @@ -43,6 +41,12 @@ jobs: uses: actions/setup-java@v1 with: java-version: 11 + - uses: actions/cache@v1 + with: + path: ~/.m2/repository + key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} + restore-keys: | + ${{ runner.os }}-maven- # Some tests need screen access - name: Install xvfb run: sudo apt-get install xvfb diff --git a/.github/workflows/maven-pr-builder.yml b/.github/workflows/maven-pr-builder.yml new file mode 100644 index 000000000..ea5d3d703 --- /dev/null +++ b/.github/workflows/maven-pr-builder.yml @@ -0,0 +1,64 @@ +# +# The MIT License +# Copyright © 2014-2019 Ilkka Seppälä +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. +# + +# This workflow will build a Java project with Maven +# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven + +name: Java PR Builder + +on: + pull_request: + branches: [ master ] + +jobs: + build: + + runs-on: ubuntu-18.04 + + steps: + - uses: actions/checkout@v2 + - name: Set up JDK 11 + uses: actions/setup-java@v1 + with: + java-version: 11 + - uses: actions/cache@v1 + with: + path: ~/.m2/repository + key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} + restore-keys: | + ${{ runner.os }}-maven- + # Some tests need screen access + - name: Install xvfb + run: sudo apt-get install 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 + GITHUB_TOKEN: ${{ secrets.REPOSITORY_ACCESS_TOKEN }} + SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} From 79a6af703ec94e3719c05122e0c1c08768a877d6 Mon Sep 17 00:00:00 2001 From: Subhrodip Mohanta Date: Sun, 16 Aug 2020 12:49:21 +0530 Subject: [PATCH 2/4] updated copyright year to 2020 --- .github/workflows/maven-ci.yml | 2 +- .github/workflows/maven-pr-builder.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/maven-ci.yml b/.github/workflows/maven-ci.yml index 914db3f4d..a04b0021e 100644 --- a/.github/workflows/maven-ci.yml +++ b/.github/workflows/maven-ci.yml @@ -1,6 +1,6 @@ # # The MIT License -# Copyright © 2014-2019 Ilkka Seppälä +# Copyright © 2014-2020 Ilkka Seppälä # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/.github/workflows/maven-pr-builder.yml b/.github/workflows/maven-pr-builder.yml index ea5d3d703..0384c326c 100644 --- a/.github/workflows/maven-pr-builder.yml +++ b/.github/workflows/maven-pr-builder.yml @@ -1,6 +1,6 @@ # # The MIT License -# Copyright © 2014-2019 Ilkka Seppälä +# Copyright © 2014-2020 Ilkka Seppälä # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal From 241f93f3ccd6d83b16006ede3c5241f5feae480a Mon Sep 17 00:00:00 2001 From: Subhrodip Mohanta Date: Mon, 17 Aug 2020 11:28:33 +0530 Subject: [PATCH 3/4] updated cache to v2 and removed SQ analysis --- .github/workflows/maven-ci.yml | 2 +- .github/workflows/maven-pr-builder.yml | 9 +-------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/.github/workflows/maven-ci.yml b/.github/workflows/maven-ci.yml index a04b0021e..8a7f7a0bb 100644 --- a/.github/workflows/maven-ci.yml +++ b/.github/workflows/maven-ci.yml @@ -41,7 +41,7 @@ jobs: uses: actions/setup-java@v1 with: java-version: 11 - - uses: actions/cache@v1 + - uses: actions/cache@v2 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} diff --git a/.github/workflows/maven-pr-builder.yml b/.github/workflows/maven-pr-builder.yml index 0384c326c..1bdad0621 100644 --- a/.github/workflows/maven-pr-builder.yml +++ b/.github/workflows/maven-pr-builder.yml @@ -41,7 +41,7 @@ jobs: uses: actions/setup-java@v1 with: java-version: 11 - - uses: actions/cache@v1 + - uses: actions/cache@v2 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} @@ -55,10 +55,3 @@ jobs: - 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 - GITHUB_TOKEN: ${{ secrets.REPOSITORY_ACCESS_TOKEN }} - SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} From 8c5740563dc5c1eb01c55bdcc919a70bb880d99d Mon Sep 17 00:00:00 2001 From: Subhrodip Mohanta Date: Mon, 17 Aug 2020 19:12:54 +0530 Subject: [PATCH 4/4] reverted the copyright year back to 2019 --- .github/workflows/maven-ci.yml | 2 +- .github/workflows/maven-pr-builder.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/maven-ci.yml b/.github/workflows/maven-ci.yml index 8a7f7a0bb..be0a74e9f 100644 --- a/.github/workflows/maven-ci.yml +++ b/.github/workflows/maven-ci.yml @@ -1,6 +1,6 @@ # # The MIT License -# Copyright © 2014-2020 Ilkka Seppälä +# Copyright © 2014-2019 Ilkka Seppälä # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/.github/workflows/maven-pr-builder.yml b/.github/workflows/maven-pr-builder.yml index 1bdad0621..7e4f3670f 100644 --- a/.github/workflows/maven-pr-builder.yml +++ b/.github/workflows/maven-pr-builder.yml @@ -1,6 +1,6 @@ # # The MIT License -# Copyright © 2014-2020 Ilkka Seppälä +# Copyright © 2014-2019 Ilkka Seppälä # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal