gaspersic/java-design-patterns
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1509 from ohbus/master

Browse Source 
Cleaning up unnecessary code from the CI yaml and CI server version upgrade
This commit is contained in:
Ilkka Seppälä 2020-08-29 20:19:42 +03:00 committed by GitHub
commit b53856b64f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
.github/workflows/maven-ci.yml vendored
View File

@ -33,7 +33,7 @@ on:
jobs: jobs:
build: build:
runs-on: ubuntu-18.04 runs-on: ubuntu-20.04
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
@ -49,14 +49,11 @@ jobs:
${{ runner.os }}-maven- ${{ runner.os }}-maven-
# Some tests need screen access # Some tests need screen access
- name: Install xvfb - name: Install xvfb
run: sudo apt-get 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 # 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 - 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 run: xvfb-run mvn clean verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar
env: env:
# These two env variables are needed for sonar analysis # These two env variables are needed for sonar analysis

8
.github/workflows/maven-pr-builder.yml vendored
View File

@ -33,7 +33,7 @@ on:
jobs: jobs:
build: build:
runs-on: ubuntu-18.04 runs-on: ubuntu-20.04
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
@ -49,9 +49,9 @@ jobs:
${{ runner.os }}-maven- ${{ runner.os }}-maven-
# Some tests need screen access # Some tests need screen access
- name: Install xvfb - name: Install xvfb
run: sudo apt-get 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 # See https://jira.sonarsource.com/browse/MMF-1371
- name: Build with Maven - name: Build with Maven
if: github.ref != 'refs/heads/master'
run: xvfb-run mvn clean verify run: xvfb-run mvn clean verify