Skip to content

Commit

Permalink
Release via artifact-release-plugin
Browse files Browse the repository at this point in the history
  • Loading branch information
f0y committed Feb 1, 2021
1 parent af82a55 commit f7da0e7
Show file tree
Hide file tree
Showing 11 changed files with 190 additions and 59 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,4 @@ tmp/
out/
*.log
classes
git_key
25 changes: 20 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,30 @@ install:
- true

before_script:
- git config --global user.email "[email protected]"
- git config --global user.name "YoomoneyRobot"
- git config --global user.email "[email protected]"
- git config --global user.name "YoomoneyRobot"
- git checkout -f $TRAVIS_BRANCH
# Decrypt the git_key.enc key into git_key
- |
if [ $TRAVIS_BRANCH == "master" ] && [ $TRAVIS_PULL_REQUEST == "false" ]; then
openssl aes-256-cbc -k $GIT_PRIVATE_KEY_PASS -in git_key.enc -out git_key -d
fi
- export GIT_PRIVATE_SSH_KEY_PATH=$TRAVIS_BUILD_DIR/git_key

script:
- ./gradlew -b build.gradle clean build bintrayUpload --info
jobs:
include:
- stage: build
script:
- ./gradlew -b build.gradle clean build test --info
- stage: release
if: branch = master
script:
- |
./gradlew -b build.gradle preRelease --info
./gradlew -b build.gradle release --info
after_success:
- bash <(curl -s https://codecov.io/bash)
- ./publish_doc.sh

before_cache:
- rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
Expand Down
9 changes: 8 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
### NEXT_VERSION_TYPE=MAJOR|MINOR|PATCH
### NEXT_VERSION_TYPE=MAJOR
### NEXT_VERSION_DESCRIPTION_BEGIN
* Upgrade to Spring Boot 2.4.1
* Release via `ru.yoomoney.gradle.plugins.artifact-release-plugin`
### NEXT_VERSION_DESCRIPTION_END
## [9.0.0]() (30-11-2020)

* Rebranding Yandex.Money to YooMoney
* Changed package names to `ru.yoomoney.tech.dbqueue` instead
of `ru.yandex.money.common.dbqueue`
## [8.4.0]() (20-05-2020)

* Oracle support
Expand Down
1 change: 1 addition & 0 deletions CODEOWNERS
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* @yoomoney-tech/backend-experts
20 changes: 17 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,11 +1,27 @@
buildscript {
repositories {
jcenter()
dependencies {
classpath 'ru.yoomoney.gradle.plugins:artifact-release-plugin:3.5.1'
}
}
}

plugins {
id "com.jfrog.bintray" version "1.8.4"
id "ru.yoomoney.gradle.plugins.artifact-release-plugin" version "3.5.1"
}

releaseSettings {
releaseTasks = ["build", "bintrayUpload"]
pathToGitPrivateSshKey = System.getenv("GIT_PRIVATE_SSH_KEY_PATH")
passphraseToGitPrivateSshKey = System.getenv("GIT_KEY_PASSPHRASE")
gitUsername = "yoomoney-robot"
gitEmail = "[email protected]"
changelogRequired = true
addPullRequestLinkToChangelog = true
pullRequestInfoProvider = "GitHub"
githubAccessToken = System.getenv("GITHUB_TOKEN")
}

repositories {
Expand Down Expand Up @@ -45,7 +61,7 @@ jar {
'Implementation-Title': "$project.name",
'Built-By': java.lang.System.getProperty('user.name'),
'Built-Date': new Date().format('yyyy-MM-dd'),
'Copyright': '2020 NBCO YooMoney LLC',
'Copyright': '2021 NBCO YooMoney LLC',
'License': 'MIT'
)
}
Expand Down Expand Up @@ -124,8 +140,6 @@ publishing {
}
}

bintrayUpload.onlyIf { !project.version.endsWith("-SNAPSHOT") }

bintray {
user = System.getenv('BINTRAY_USER')
key = System.getenv('BINTRAY_API_KEY')
Expand Down
12 changes: 6 additions & 6 deletions dependencies.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
dependencies {
def springVersion = '5.1.2.RELEASE'
compile 'org.slf4j:slf4j-api:1.7.25',
def springVersion = '5.3.2'
compile 'org.slf4j:slf4j-api:1.7.30',
"org.springframework:spring-jdbc:${springVersion}",
"org.springframework:spring-tx:${springVersion}"

Expand All @@ -12,11 +12,11 @@ dependencies {
'com.microsoft.sqlserver:mssql-jdbc:8.2.0.jre8',
'org.testcontainers:postgresql:1.13.0',
'org.testcontainers:oracle-xe:1.13.0',
'org.postgresql:postgresql:42.2.5',
'org.postgresql:postgresql:42.2.18',
'junit:junit:4.12',
'org.apache.logging.log4j:log4j-core:2.11.1',
'org.apache.logging.log4j:log4j-slf4j-impl:2.11.1',
'org.mockito:mockito-core:2.23.0',
'org.apache.logging.log4j:log4j-core:2.13.3',
'org.apache.logging.log4j:log4j-slf4j-impl:2.13.3',
'org.mockito:mockito-core:3.6.28',
'com.tngtech.archunit:archunit:0.9.1',
'nl.jqno.equalsverifier:equalsverifier:3.3',
'com.github.marschall:memoryfilesystem:1.0.0'
Expand Down
Binary file added git_key.enc
Binary file not shown.
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
53 changes: 33 additions & 20 deletions gradlew
Original file line number Diff line number Diff line change
@@ -1,5 +1,21 @@
#!/usr/bin/env sh

#
# Copyright 2015 the original author or authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#

##############################################################################
##
## Gradle start up script for UN*X
Expand Down Expand Up @@ -28,7 +44,7 @@ APP_NAME="Gradle"
APP_BASE_NAME=`basename "$0"`

# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS=""
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"
Expand Down Expand Up @@ -66,6 +82,7 @@ esac

CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar


# Determine the Java command to use to start the JVM.
if [ -n "$JAVA_HOME" ] ; then
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
Expand Down Expand Up @@ -109,10 +126,11 @@ if $darwin; then
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
fi

# For Cygwin, switch paths to Windows format before running java
if $cygwin ; then
# For Cygwin or MSYS, switch paths to Windows format before running java
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`

JAVACMD=`cygpath --unix "$JAVACMD"`

# We build the pattern for arguments to be converted via cygpath
Expand All @@ -138,19 +156,19 @@ if $cygwin ; then
else
eval `echo args$i`="\"$arg\""
fi
i=$((i+1))
i=`expr $i + 1`
done
case $i in
(0) set -- ;;
(1) set -- "$args0" ;;
(2) set -- "$args0" "$args1" ;;
(3) set -- "$args0" "$args1" "$args2" ;;
(4) set -- "$args0" "$args1" "$args2" "$args3" ;;
(5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
(6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
(7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
(8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
(9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
0) set -- ;;
1) set -- "$args0" ;;
2) set -- "$args0" "$args1" ;;
3) set -- "$args0" "$args1" "$args2" ;;
4) set -- "$args0" "$args1" "$args2" "$args3" ;;
5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
esac
fi

Expand All @@ -159,14 +177,9 @@ save () {
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
echo " "
}
APP_ARGS=$(save "$@")
APP_ARGS=`save "$@"`

# Collect all arguments for the java command, following the shell quoting and substitution rules
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"

# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
cd "$(dirname "$0")"
fi

exec "$JAVACMD" "$@"
104 changes: 104 additions & 0 deletions gradlew.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,104 @@
@rem
@rem Copyright 2015 the original author or authors.
@rem
@rem Licensed under the Apache License, Version 2.0 (the "License");
@rem you may not use this file except in compliance with the License.
@rem You may obtain a copy of the License at
@rem
@rem https://www.apache.org/licenses/LICENSE-2.0
@rem
@rem Unless required by applicable law or agreed to in writing, software
@rem distributed under the License is distributed on an "AS IS" BASIS,
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem

@if "%DEBUG%" == "" @echo off
@rem ##########################################################################
@rem
@rem Gradle startup script for Windows
@rem
@rem ##########################################################################

@rem Set local scope for the variables with windows NT shell
if "%OS%"=="Windows_NT" setlocal

set DIRNAME=%~dp0
if "%DIRNAME%" == "" set DIRNAME=.
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%

@rem Resolve any "." and ".." in APP_HOME to make it shorter.
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi

@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"

@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome

set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if "%ERRORLEVEL%" == "0" goto init

echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.

goto fail

:findJavaFromJavaHome
set JAVA_HOME=%JAVA_HOME:"=%
set JAVA_EXE=%JAVA_HOME%/bin/java.exe

if exist "%JAVA_EXE%" goto init

echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.

goto fail

:init
@rem Get command-line arguments, handling Windows variants

if not "%OS%" == "Windows_NT" goto win9xME_args

:win9xME_args
@rem Slurp the command line arguments.
set CMD_LINE_ARGS=
set _SKIP=2

:win9xME_args_slurp
if "x%~1" == "x" goto execute

set CMD_LINE_ARGS=%*

:execute
@rem Setup the command line

set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar


@rem Execute Gradle
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%

:end
@rem End local scope for the variables with windows NT shell
if "%ERRORLEVEL%"=="0" goto mainEnd

:fail
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
rem the _cmd.exe /c_ return code!
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
exit /b 1

:mainEnd
if "%OS%"=="Windows_NT" endlocal

:omega
24 changes: 0 additions & 24 deletions publish_doc.sh

This file was deleted.

0 comments on commit f7da0e7

Please sign in to comment.