valitydev/swag-anapi-v2
14
0
Fork 0
mirror of https://github.com/valitydev/swag-anapi-v2.git synced 2024-11-06 09:15:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix CI

Browse Source
This commit is contained in:
echerniak 2021-09-22 00:15:11 +03:00
parent 0e81ed40a1
commit ac3f3c3326
No known key found for this signature in database
GPG Key ID: 7D79B3A9CB749B36
4 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Jenkinsfile vendored
View File

@ -10,7 +10,7 @@ build('swag-anapi-v2', 'docker-host') {
def gitUtils
runStage('load pipeline') {
env.JENKINS_LIB = "build_utils/jenkins_lib"
pipeDefault = load("${env.JENKINS_LIB}/pipeJavaLibInsideDocker.groovy")
pipeDefault = load("${env.JENKINS_LIB}/pipeDefault.groovy")
withWsCache = load("${env.JENKINS_LIB}/withWsCache.groovy")
gitUtils = load("${env.JENKINS_LIB}/gitUtils.groovy")
}
@ -33,6 +33,7 @@ build('swag-anapi-v2', 'docker-host') {
// Java
runStage('build java client & server') {
env.JAVA_HOME = sh(returnStdout: true, script: 'java-config --select-vm openjdk-bin-11 --jdk-home').trim()
withCredentials([[$class: 'FileBinding', credentialsId: 'java-maven-settings.xml', variable: 'SETTINGS_XML']]) {
if (env.BRANCH_NAME == 'master' || env.BRANCH_NAME.startsWith('epic/')) {
sh 'make SETTINGS_XML=${SETTINGS_XML} BRANCH_NAME=${BRANCH_NAME} REPO_PUBLIC=${REPO_PUBLIC} java.openapi.deploy_client'

8
Makefile
View File

@ -56,7 +56,7 @@ MVN = mvn -s $(SETTINGS_XML) -Dcommit.number="$(NUMBER_COMMITS)"
java.openapi.compile_client: java.settings
$(MVN) clean && \
$(MVN) compile -P="client"
$(MVN) compile -P="client" -P="$(REPO_PROFILE)"
java.openapi.deploy_client: java.settings
$(MVN) clean && \
@ -66,11 +66,11 @@ java.openapi.deploy_client: java.settings
java.openapi.install_client: java.settings
$(MVN) clean && \
$(MVN) versions:set versions:commit -DnewVersion="$(JAVA_PKG_VERSION)-client" && \
$(MVN) install -P="client"
$(MVN) install -P="client" -P="$(REPO_PROFILE)"
java.openapi.compile_server: java.settings
$(MVN) clean && \
$(MVN) compile -P="server"
$(MVN) compile -P="server" -P="$(REPO_PROFILE)"
java.openapi.deploy_server: java.settings
$(MVN) clean && \
@ -80,7 +80,7 @@ java.openapi.deploy_server: java.settings
java.openapi.install_server: java.settings
$(MVN) clean && \
$(MVN) versions:set versions:commit -DnewVersion="$(JAVA_PKG_VERSION)-server" && \
$(MVN) install -P="server"
$(MVN) install -P="server" -P="$(REPO_PROFILE)"
java.compile: java.settings
$(MVN) compile

2
build_utils

@ -1 +1 @@
Subproject commit c12c9dd296912ec3c34ad443b448df98fef2556a
Subproject commit be44d69fc87b22a0bb82d98d6eae7658d1647f98

6
pom.xml
View File

@ -7,11 +7,11 @@
<parent>
<groupId>com.rbkmoney</groupId>
<artifactId>library-parent-pom</artifactId>
<version>1.0.7</version>
<version>1.0.8</version>
</parent>
<artifactId>swag-anapi-v2</artifactId>
<version>1.0.0-SNAPSHOT</version>
<version>1.0.0</version>
<packaging>jar</packaging>
<name>anapi v2</name>
@ -22,7 +22,7 @@
<default.package>com.rbkmoney.openapi.anapi_v2</default.package>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven-plugin-version>1.0.0</maven-plugin-version>
<java.version>8</java.version>
<java.version>11</java.version>
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
<slf4j-version>1.7.21</slf4j-version>