Skip to content

Commit e9d0b3e

Browse files
authored
remove labeling trigger for PR and actions set to master (iluwatar#1666)
1 parent 9034532 commit e9d0b3e

File tree

2 files changed

+8
-14
lines changed

2 files changed

+8
-14
lines changed

.github/workflows/maven-ci.yml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,25 +40,25 @@ jobs:
4040
steps:
4141

4242
- name: Checkout Code
43-
uses: actions/checkout@v2
43+
uses: actions/checkout@master
4444
with:
4545
# Disabling shallow clone for improving relevancy of SonarQube reporting
4646
fetch-depth: 0
4747

4848
- name: Set up JDK 11
49-
uses: actions/setup-java@v1
49+
uses: actions/setup-java@master
5050
with:
5151
java-version: 11
5252

5353
- name: Cache SonarCloud packages
54-
uses: actions/cache@v2
54+
uses: actions/cache@master
5555
with:
5656
path: ~/.sonar/cache
5757
key: ${{ runner.os }}-sonar
5858
restore-keys: ${{ runner.os }}-sonar
5959

6060
- name: Cache Maven dependencies
61-
uses: actions/cache@v2
61+
uses: actions/cache@master
6262
with:
6363
path: ~/.m2/repository
6464
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
@@ -69,9 +69,6 @@ jobs:
6969
- name: Install xvfb
7070
run: sudo apt-get install -y xvfb
7171

72-
# The SonarQube analysis is only for the master branch of the main repository.
73-
# SonarQube scan does not work for forked repositories try changing it to xvfb-run mvn clean verify
74-
# See https://jira.sonarsource.com/browse/MMF-1371
7572
- name: Build with Maven and run SonarQube analysis
7673
run: xvfb-run ./mvnw clean verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar
7774
env:

.github/workflows/maven-pr-builder.yml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ name: Java PR Builder
2929
on:
3030
pull_request:
3131
branches: [ master ]
32-
types: [ opened, reopened, synchronize, labeled, unlabeled ]
32+
types: [ opened, reopened, synchronize ]
3333

3434
jobs:
3535
build:
@@ -38,15 +38,15 @@ jobs:
3838

3939
steps:
4040
- name: Checkout Code
41-
uses: actions/checkout@v2
41+
uses: actions/checkout@master
4242

4343
- name: Set up JDK 11
44-
uses: actions/setup-java@v1
44+
uses: actions/setup-java@master
4545
with:
4646
java-version: 11
4747

4848
- name: Cache Maven Dependecies
49-
uses: actions/cache@v2
49+
uses: actions/cache@master
5050
with:
5151
path: ~/.m2/repository
5252
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
@@ -57,8 +57,5 @@ jobs:
5757
- name: Install xvfb
5858
run: sudo apt-get install -y xvfb
5959

60-
# This worflow is only for building Pull Requests, the master branch runs Sonar analysis on the main repository.
61-
# SonarQube scan does not work for forked repositories.
62-
# See https://jira.sonarsource.com/browse/MMF-1371
6360
- name: Build with Maven
6461
run: xvfb-run ./mvnw clean verify

0 commit comments

Comments
 (0)