mirror of
https://github.com/valitydev/cds-proto.git
synced 2024-11-06 01:35:17 +00:00
Build impl
This commit is contained in:
Egor Cherniak
parent
74a763b2ba
commit
8a1f9b0273
29
.github/workflows/build.yml
vendored
Normal file
29
.github/workflows/build.yml
vendored
Normal file
@ -0,0 +1,29 @@
|
||||
name: Build Artifact
|
||||
|
||||
on:
|
||||
pull_request:
|
||||
branches:
|
||||
- '*'
|
||||
|
||||
jobs:
|
||||
build:
|
||||
runs-on: ubuntu-20.04
|
||||
steps:
|
||||
- name: Install thrift
|
||||
uses: valitydev/action-setup-thrift@v0.0.1
|
||||
- name: Checkout Repo
|
||||
uses: actions/checkout@v2
|
||||
with:
|
||||
fetch-depth: 0
|
||||
- name: Set up Maven
|
||||
uses: actions/setup-java@v2
|
||||
with:
|
||||
java-version: '15'
|
||||
distribution: 'adopt'
|
||||
- name: Retrieve commit info
|
||||
run: |
|
||||
echo "::set-output name=COMMIT_NUMBER::$(git rev-list HEAD --count)"
|
||||
echo "::set-output name=SHA_7::${GITHUB_SHA::7}"
|
||||
id: commit_info
|
||||
- name: Build package
|
||||
run: mvn --batch-mode -Dcommit.number=${{ steps.commit_info.outputs.COMMIT_NUMBER }} -Drevision="1.${{ steps.commit_info.outputs.COMMIT_NUMBER }}-${{ steps.commit_info.outputs.SHA_7 }}" clean compile -f pom.xml
|
||||
31
.github/workflows/deploy.yml
vendored
Normal file
31
.github/workflows/deploy.yml
vendored
Normal file
@ -0,0 +1,31 @@
|
||||
name: Deploy Artifact
|
||||
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- 'master'
|
||||
- 'main'
|
||||
|
||||
jobs:
|
||||
deploy:
|
||||
runs-on: ubuntu-20.04
|
||||
steps:
|
||||
- name: Install thrift
|
||||
uses: valitydev/action-setup-thrift@v0.0.1
|
||||
- name: Checkout Repo
|
||||
uses: actions/checkout@v2
|
||||
with:
|
||||
fetch-depth: 0
|
||||
- name: Retrieve commit info
|
||||
run: |
|
||||
echo "::set-output name=COMMIT_NUMBER::$(git rev-list HEAD --count)"
|
||||
echo "::set-output name=SHA_7::${GITHUB_SHA::7}"
|
||||
id: commit_info
|
||||
- name: Deploy package
|
||||
uses: valitydev/action-deploy-jdk-package@v1.0.9
|
||||
with:
|
||||
server-username: ${{ secrets.OSSRH_USERNAME }}
|
||||
server-password: ${{ secrets.OSSRH_TOKEN }}
|
||||
deploy-secret-key: ${{ secrets.OSSRH_GPG_SECRET_KEY }}
|
||||
deploy-secret-key-password: ${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }}
|
||||
maven-args: '-Dcommit.number=${{ steps.commit_info.outputs.COMMIT_NUMBER }} -Drevision="1.${{ steps.commit_info.outputs.COMMIT_NUMBER }}-${{ steps.commit_info.outputs.SHA_7 }}"'
|
||||
4
.gitmodules
vendored
4
.gitmodules
vendored
@ -1,4 +0,0 @@
|
||||
[submodule "build_utils"]
|
||||
path = build_utils
|
||||
url = git@github.com:rbkmoney/build_utils.git
|
||||
branch = master
|
||||
26
Jenkinsfile
vendored
26
Jenkinsfile
vendored
@ -1,26 +0,0 @@
|
||||
#!groovy
|
||||
// -*- mode: groovy -*-
|
||||
|
||||
build('cds-proto', 'docker-host') {
|
||||
checkoutRepo()
|
||||
loadBuildUtils()
|
||||
|
||||
def pipeDefault
|
||||
def gitUtils
|
||||
runStage('load pipeline') {
|
||||
env.JENKINS_LIB = "build_utils/jenkins_lib"
|
||||
pipeDefault = load("${env.JENKINS_LIB}/pipeDefault.groovy")
|
||||
pipeJavaProto = load("${env.JENKINS_LIB}/pipeJavaProto.groovy")
|
||||
gitUtils = load("${env.JENKINS_LIB}/gitUtils.groovy")
|
||||
}
|
||||
|
||||
pipeDefault() {
|
||||
|
||||
runStage('compile') {
|
||||
sh "make wc_compile"
|
||||
}
|
||||
|
||||
env.skipSonar = 'true'
|
||||
pipeJavaProto()
|
||||
}
|
||||
}
|
||||
42
Makefile
42
Makefile
@ -1,42 +0,0 @@
|
||||
THRIFT = $(or $(shell which thrift), $(error "`thrift' executable missing"))
|
||||
REBAR = $(shell which rebar3 2>/dev/null || which ./rebar3)
|
||||
SUBMODULES = build_utils
|
||||
SUBTARGETS = $(patsubst %,%/.git,$(SUBMODULES))
|
||||
|
||||
UTILS_PATH := build_utils
|
||||
TEMPLATES_PATH := .
|
||||
|
||||
# Name of the service
|
||||
SERVICE_NAME := cds_proto
|
||||
|
||||
# Build image tag to be used
|
||||
BUILD_IMAGE_TAG := b04c5291d101132e53e578d96e1628d2e6dab0c0
|
||||
CALL_ANYWHERE := \
|
||||
all submodules compile clean distclean
|
||||
|
||||
CALL_W_CONTAINER := $(CALL_ANYWHERE)
|
||||
|
||||
all: compile
|
||||
|
||||
-include $(UTILS_PATH)/make_lib/utils_container.mk
|
||||
|
||||
.PHONY: $(CALL_W_CONTAINER)
|
||||
|
||||
# CALL_ANYWHERE
|
||||
$(SUBTARGETS): %/.git: %
|
||||
git submodule update --init $<
|
||||
touch $@
|
||||
|
||||
submodules: $(SUBTARGETS)
|
||||
|
||||
compile:
|
||||
$(REBAR) compile
|
||||
|
||||
clean:
|
||||
$(REBAR) clean
|
||||
|
||||
distclean:
|
||||
$(REBAR) clean -a
|
||||
rm -rfv _build
|
||||
|
||||
include $(UTILS_PATH)/make_lib/java_proto.mk
|
||||
@ -1 +0,0 @@
|
||||
Subproject commit 5cb25f049c719a608276a99fc4fbe852187019ca
|
||||
5
package-lock.json
generated
5
package-lock.json
generated
@ -1,5 +0,0 @@
|
||||
{
|
||||
"name": "cds-proto",
|
||||
"version": "1.0.0",
|
||||
"lockfileVersion": 1
|
||||
}
|
||||
@ -1,9 +0,0 @@
|
||||
{
|
||||
"name": "cds-proto",
|
||||
"version": "1.0.0",
|
||||
"description": "CDS service thrift protocol.",
|
||||
"author": "rbk.money",
|
||||
"private": true,
|
||||
"license": "UNLICENSED",
|
||||
"homepage": "https://github.com/rbkmoney/cds-proto#readme"
|
||||
}
|
||||
40
pom.xml
40
pom.xml
@ -5,44 +5,36 @@
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<parent>
|
||||
<groupId>com.rbkmoney</groupId>
|
||||
<artifactId>parent</artifactId>
|
||||
<version>1.0.5</version>
|
||||
<groupId>dev.vality</groupId>
|
||||
<artifactId>library-parent-pom</artifactId>
|
||||
<version>1.0.0</version>
|
||||
</parent>
|
||||
|
||||
<groupId>com.rbkmoney</groupId>
|
||||
<artifactId>cds-proto</artifactId>
|
||||
<version>SNAPSHOT</version>
|
||||
<version>${revision}</version>
|
||||
<packaging>jar</packaging>
|
||||
|
||||
<name>CDS</name>
|
||||
<description>Generates jar artifact containing compiled thrift classes based on generated thrift IDL files</description>
|
||||
<url>https://github.com/rbkmoney/cds-proto.git</url>
|
||||
|
||||
<developers>
|
||||
<developer>
|
||||
<organization>RBK.money</organization>
|
||||
<organizationUrl>https://rbk.money</organizationUrl>
|
||||
</developer>
|
||||
</developers>
|
||||
|
||||
<scm>
|
||||
<connection>scm:git:git://github.com/rbkmoney/cds-proto.git</connection>
|
||||
<developerConnection>scm:git:ssh://github.com/rbkmoney/cds-proto.git</developerConnection>
|
||||
<url>https://github.com/rbkmoney/cds-proto/tree/master</url>
|
||||
</scm>
|
||||
<url>https://github.com/valitydev/cds-proto.git</url>
|
||||
|
||||
<properties>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<revision>SNAPSHOT</revision>
|
||||
</properties>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>com.rbkmoney.woody</groupId>
|
||||
<groupId>dev.vality.woody</groupId>
|
||||
<artifactId>woody-thrift</artifactId>
|
||||
<version>[1.1.21,)</version>
|
||||
<version>1.0.0</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>javax.annotation</groupId>
|
||||
<artifactId>javax.annotation-api</artifactId>
|
||||
<version>1.3.2</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
<build>
|
||||
@ -71,7 +63,7 @@
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-shade-plugin</artifactId>
|
||||
<version>3.0.0</version>
|
||||
<version>3.2.4</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<phase>package</phase>
|
||||
@ -81,8 +73,8 @@
|
||||
<configuration>
|
||||
<relocations>
|
||||
<relocation>
|
||||
<pattern>com.rbkmoney.damsel</pattern>
|
||||
<shadedPattern>com.rbkmoney.damsel.v${commit.number}</shadedPattern>
|
||||
<pattern>dev.vality.damsel</pattern>
|
||||
<shadedPattern>dev.vality.damsel.v${commit.number}</shadedPattern>
|
||||
</relocation>
|
||||
</relocations>
|
||||
<shadedArtifactAttached>true</shadedArtifactAttached>
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
|
||||
namespace java com.rbkmoney.cds.base
|
||||
namespace java dev.vality.cds.base
|
||||
namespace erlang cds
|
||||
|
||||
typedef string Token
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
namespace java com.rbkmoney.cds.keyring
|
||||
namespace java dev.vality.cds.keyring
|
||||
namespace erlang cds
|
||||
|
||||
typedef string ShareholderId;
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
include "base.thrift"
|
||||
|
||||
namespace java com.rbkmoney.cds.storage
|
||||
namespace java dev.vality.cds.storage
|
||||
namespace erlang cds
|
||||
|
||||
/** Дата экспирации */
|
||||
|
||||
@ -52,7 +52,7 @@
|
||||
|
||||
{plugins, [
|
||||
{rebar3_thrift_compiler,
|
||||
{git, "https://github.com/rbkmoney/rebar3_thrift_compiler.git", {tag, "0.3.0"}}}
|
||||
{git, "https://github.com/valitydev/rebar3_thrift_compiler.git", {tag, "0.3.0"}}}
|
||||
]}.
|
||||
|
||||
{provider_hooks, [
|
||||
|
||||
Loading…
Reference in New Issue
Block a user