Skip to content

Commit da515ce

Browse files
author
Paul McCann
authored
Update release.yml
1 parent 2ddc26c commit da515ce

File tree

1 file changed

+17
-18
lines changed

1 file changed

+17
-18
lines changed

.github/workflows/release.yml

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,29 @@
11
name: Release to Dockerhub
2-
on: push
3-
# pull_request:
4-
# types:
5-
# - closed
6-
# branches: [master, dev]
7-
# paths-ignore:
8-
# - '**.md'
9-
# - '.github/ISSUE_TEMPLATE'
10-
# - '.gitignore'
11-
# - 'provisioning'
12-
# - '.sonarcloud.properties'
13-
# - 'LICENSE'
14-
# - 'Vagrantfile'
2+
on:
3+
pull_request:
4+
types:
5+
- closed
6+
branches: [master, dev]
7+
paths-ignore:
8+
- '**.md'
9+
- '.github/ISSUE_TEMPLATE'
10+
- '.gitignore'
11+
- 'provisioning'
12+
- '.sonarcloud.properties'
13+
- 'LICENSE'
14+
- 'Vagrantfile'
1515

1616
jobs:
1717
build:
18-
# if: github.event.pull_request.merged == true
18+
if: github.event.pull_request.merged == true
1919
name: build
2020
runs-on: ubuntu-latest
2121
steps:
2222
- uses: actions/checkout@v2
2323
- name: Set up JDK 1.8
24-
uses: actions/setup-java@v3.6.0
24+
uses: actions/setup-java@v1.0
2525
with:
26-
distribution: 'zulu'
27-
java-version: '8'
26+
java-version: 1.8
2827
- name: Build Maven with Docker Profile and Generate SBOM
2928
run: mvn clean install -Pdocker -DskipTests -B -DexcludeTestProject=true cyclonedx:makeBom
3029
- name: Upload WAR File
@@ -73,7 +72,7 @@ jobs:
7372
7473
release-security-shepherd:
7574
needs: build
76-
# if: github.event.pull_request.merged == true
75+
if: github.event.pull_request.merged == true
7776
runs-on: ubuntu-latest
7877
steps:
7978
- name: Checkout

0 commit comments

Comments
 (0)