Skip to content

Commit

Permalink
ci: fix merge main and pr close flows (#18)
Browse files Browse the repository at this point in the history
  • Loading branch information
Ricardo Campos authored and DerekRoberts committed May 14, 2024
1 parent 11a9ef9 commit 1e1827b
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
6 changes: 6 additions & 0 deletions .github/workflows/merge-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,12 @@ jobs:
with:
languages: java

- name: Set up JDK 17
uses: actions/setup-java@v2
with:
java-version: '17'
distribution: 'adopt'

# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/pr-close.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,6 @@ jobs:
name: Release Notes
runs-on: ubuntu-latest
if: github.event.pull_request.merged == true && github.event.pull_request.base.ref == 'main'
needs:
- security
- test
steps:
- uses: actions/checkout@v3
- uses: actions/cache@v2
Expand Down

0 comments on commit 1e1827b

Please sign in to comment.