Skip to content

Commit

Permalink
Merge branch 'develop' into EPMRPP-96317-extend-analyzer-statistics
Browse files Browse the repository at this point in the history
  • Loading branch information
grabsefx committed Dec 12, 2024
2 parents 46cbc68 + 91aea00 commit 54a1779
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 13 deletions.
23 changes: 11 additions & 12 deletions .github/workflows/java-checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,18 @@ on:
- '.github/**'
- README.md
- gradle.properties
push:
branches:
- master
- develop
paths-ignore:
- '.github/**'
- README.md
- gradle.properties

jobs:
call-java-cheks:
name: Call Java checks
call-java-checks:
if : ${{ github.event_name == 'pull_request' && github.base_ref != 'refs/heads/master' }}
name: Call Java Checks
uses: reportportal/.github/.github/workflows/java-checks.yaml@main
secrets: inherit

call-release-java-checks:
if: ${{ github.event_name == 'pull_request' && github.base_ref == 'refs/heads/master' }}
name: Call Release Java Checks
uses: reportportal/.github/.github/workflows/java-checks.yaml@main
with:
java-version: '21'
runs-on: ubuntu-latest
release-mode: true
secrets: inherit
4 changes: 4 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -109,3 +109,7 @@ test {

publish.dependsOn build
publish.mustRunAfter build

tasks.preTagCommit.enabled = false
tasks.updateVersion.enabled = false
tasks.commitNewVersion.enabled = false
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version=5.12.1
version=5.13.0
description=EPAM Report portal. Service jobs
dockerServerUrl=unix:///var/run/docker.sock
dockerPrepareEnvironment=
Expand Down

0 comments on commit 54a1779

Please sign in to comment.