Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge master to 5.7.5 #66

Merged
merged 8 commits into from
Apr 5, 2023
Merged

Merge master to 5.7.5 #66

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b986e8e
Merge pull request #51 from reportportal/master
miracle8484 Dec 26, 2022
ebf135b
Merge pull request #53 from reportportal/5.7.4
miracle8484 Dec 26, 2022
26a4f5e
EPMRPP-80865|| Update bom version
IvanKustau Jan 30, 2023
c978893
Merge pull request #56 from reportportal/5.7.4
IvanKustau Jan 30, 2023
b62775e
[Gradle Release Plugin] - new version commit: '5.7.5'.
autoreportportal Jan 30, 2023
0033dc4
EPMRPP-82673-exec-jar promote.yml update (added exec jar)
rkukharenka Mar 17, 2023
fc293ca
Merge pull request #63 from reportportal/EPMRPP-82673-exec-jar
rkukharenka Mar 17, 2023
0e15b1e
Merge branch 'hotfix/5.7.5' into master_to_5.7.5
IvanKustau Apr 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/promote.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ on:
env:
REPOSITORY_URL: 'https://maven.pkg.github.com'
UPSTREAM_REPOSITORY_URL: 'https://oss.sonatype.org'
PACKAGE_SUFFIXES: '-javadoc.jar,-javadoc.jar.asc,-sources.jar,-sources.jar.asc,.jar,.jar.asc,.pom,.pom.asc'
PACKAGE_SUFFIXES: '-exec.jar,-exec.jar.asc,-javadoc.jar,-javadoc.jar.asc,-sources.jar,-sources.jar.asc,.jar,.jar.asc,.pom,.pom.asc'
PACKAGE: 'com.epam.reportportal'


Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ on:
env:
GH_USER_NAME: github.actor
SCRIPTS_VERSION: 5.7.0
BOM_VERSION: 5.7.3
BOM_VERSION: 5.7.4
REPOSITORY_URL: 'https://maven.pkg.github.com/'

jobs:
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
FROM amazoncorretto:11.0.17
LABEL version=5.7.3 description="EPAM Report portal. Service jobs" maintainer="Andrei Varabyeu <[email protected]>, Hleb Kanonik <[email protected]>"
LABEL version=5.7.4 description="EPAM Report portal. Service jobs" maintainer="Andrei Varabyeu <[email protected]>, Hleb Kanonik <[email protected]>"
ARG GH_TOKEN
ARG GH_URL=https://__:[email protected]/reportportal/service-jobs/com/epam/reportportal/service-jobs/5.7.3/service-jobs-5.7.3-exec.jar
ARG GH_URL=https://__:[email protected]/reportportal/service-jobs/com/epam/reportportal/service-jobs/5.7.4/service-jobs-5.7.4-exec.jar
RUN curl -O -L $GH_URL \
--output service-jobs-5.7.3-exec.jar && \
echo 'exec java ${JAVA_OPTS} -jar service-jobs-5.7.3-exec.jar' > /start.sh && chmod +x /start.sh
echo 'exec java ${JAVA_OPTS} -jar service-jobs-5.7.4-exec.jar' > /start.sh && chmod +x /start.sh
ENV JAVA_OPTS="-Xmx512m -XX:+UseG1GC -XX:InitiatingHeapOccupancyPercent=70 -Djava.security.egd=file:/dev/./urandom"
VOLUME ["/tmp"]
EXPOSE 8080
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version=5.7.4
version=5.7.5
description=EPAM Report portal. Service jobs
dockerServerUrl=unix:///var/run/docker.sock
dockerPrepareEnvironment=apk -U -q upgrade && apk --no-cache -q add openjdk11 ca-certificates
Expand Down