Move to gh actions (#2)

* Move to gh actions

* Remove build_utils

Co-authored-by: Inal Arsanukaev <inalarsanukaev@192.168.1.3>

.github/workflows/build.yml

@@ -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

.github/workflows/deploy.yml

@@ -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.12
+        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 }}"'

.github/workflows/erlang-pr.yml

@@ -0,0 +1,37 @@
+name: Erlang
+on:
+  pull_request:
+    branches: [ '*' ]
+  push:
+    branches: [ master ]
+
+jobs:
+  build:
+    name: Build and verify
+    runs-on: ubuntu-latest
+    steps:
+
+      - uses: actions/checkout@v2
+
+      - uses: valitydev/action-setup-thrift@b457b89c7e1e960ea354f510bce69a725d16c556
+        with:
+          thrift-version: '0.14.2'
+
+      - uses: erlef/setup-beam@v1.9
+        id: beam
+        with:
+          otp-version: '24'
+          rebar3-version: '3.18'
+
+      - name: Restore PLT cache
+        uses: actions/cache@v2
+        id: plt-cache
+        with:
+          key: |
+            ${{ runner.os }}-${{ steps.beam.outputs.otp-version }}-plt
+          path: |
+            _build/default/rebar3_*_plt
+
+      - run: rebar3 compile
+      - run: rebar3 xref
+      - run: rebar3 dialyzer

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "build_utils"]
-	path = build_utils
-	url = https://github.com/rbkmoney/build_utils.git

Jenkinsfile

@@ -1,26 +0,0 @@
-#!groovy
-// -*- mode: groovy -*-
-
-build('pstds-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()
-  }
-}

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 := pstds_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

build_utils

@@ -1 +0,0 @@
-Subproject commit e89b885839df8013df804d48ff24dff10c9c451e

package-lock.json

@@ -1,5 +0,0 @@
-{
-  "name": "pstds-proto",
-  "version": "1.0.0",
-  "lockfileVersion": 1
-}

package.json

@@ -1,9 +0,0 @@
-{
-  "name": "pstds-proto",
-  "version": "1.0.0",
-  "description": "PSTDS service thrift protocol.",
-  "author": "rbk.money",
-  "private": true,
-  "license": "Apache 2.0",
-  "homepage": "https://github.com/rbkmoney/pstds-proto#readme"
-}

pom.xml

@@ -5,48 +5,78 @@
     <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>pstds-proto</artifactId>
-    <version>SNAPSHOT</version>
+    <version>${revision}</version>
     <packaging>jar</packaging>
 
-    <name>PSTDS</name>
-    <description>Generates jar artifact containing compiled thrift classes based on generated thrift IDL files</description>
-    <url>https://github.com/rbkmoney/pstds-proto.git</url>
+    <name>pstds</name>
+    <description>Generates jar artifact containing compiled thrift classes based on generated thrift IDL files
+    </description>
+    <url>https://github.com/valitydev/pstds-proto</url>
+
+    <licenses>
+        <license>
+            <name>The Apache Software License, Version 2.0</name>
+            <url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
+        </license>
+    </licenses>
 
     <developers>
         <developer>
-            <organization>RBK.money</organization>
-            <organizationUrl>https://rbk.money</organizationUrl>
+            <email>devs@vality.dev</email>
+            <organization>Vality</organization>
+            <organizationUrl>https://vality.dev</organizationUrl>
         </developer>
     </developers>
 
     <scm>
-        <connection>scm:git:git://github.com/rbkmoney/pstds-proto.git</connection>
-        <developerConnection>scm:git:ssh://github.com/rbkmoney/pstds-proto.git</developerConnection>
-        <url>https://github.com/rbkmoney/pstds-proto/tree/master</url>
+        <connection>scm:git:git://github.com/valitydev/pstds-proto</connection>
+        <developerConnection>scm:git:ssh://github.com/valitydev/pstds-proto</developerConnection>
+        <url>https://github.com/valitydev/pstds-proto/tree/master</url>
     </scm>
 
     <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>
+        <dependency>
+            <groupId>dev.vality</groupId>
+            <artifactId>damsel</artifactId>
+            <version>1.538-5addc41</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
 
     <build>
         <finalName>${project.artifactId}</finalName>
+        <resources>
+            <resource>
+                <directory>${project.basedir}/proto</directory>
+                <targetPath>${project.build.outputDirectory}/proto</targetPath>
+                <includes>
+                    <include>*.thrift</include>
+                </includes>
+                <filtering>false</filtering>
+            </resource>
+        </resources>
         <plugins>
             <!-- THRIFT -->
             <plugin>
@@ -71,7 +101,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 +111,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>
@@ -93,4 +123,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

proto/base.thrift

@@ -1,4 +1,4 @@
-namespace java com.rbkmoney.pstds.base
+namespace java dev.vality.pstds.base
 namespace erlang pstds_base
 
 typedef i64 EventID

proto/event.thrift

@@ -1,4 +1,4 @@
-namespace java com.rbkmoney.pstds.event
+namespace java dev.vality.pstds.event
 namespace erlang pstds_event
 
 include "base.thrift"

proto/storage.thrift

@@ -1,4 +1,4 @@
-namespace java com.rbkmoney.pstds.storage
+namespace java dev.vality.pstds.storage
 namespace erlang pstds_storage
 
 include "base.thrift"

rebar.config

@@ -25,6 +25,13 @@
     warn_missing_spec_all
 ]}.
 
+{deps, [
+    {damsel,
+        {git, "https://github.com/valitydev/damsel.git",
+        {branch, "master"}}
+    }
+]}.
+
 %% XRef checks
 {xref_checks, [
     undefined_function_calls,
@@ -48,11 +55,9 @@
     {plt_apps, all_deps}
 ]}.
 
-{deps, []}.
-
 {plugins, [
     {rebar3_thrift_compiler,
-        {git, "https://github.com/rbkmoney/rebar3_thrift_compiler.git", {tag, "0.3.1"}}}
+        {git, "https://github.com/valitydev/rebar3_thrift_compiler.git", {branch, "master"}}}
 ]}.
 
 {provider_hooks, [
@@ -64,5 +69,6 @@
 
 {thrift_compiler_opts, [
     {in_dir, "proto"},
-    {gen, "erlang:app_prefix=pstds_proto,scoped_typenames"}
+    {in_files, all},
+    {gen, "erlang:scoped_typenames"}
 ]}.

rebar.lock

@@ -1 +1,4 @@
-[].
+[{<<"damsel">>,
+  {git,"https://github.com/valitydev/damsel",
+       {ref,"5addc419f26de2cd00294865feea3d997d308d77"}},
+  0}].

renovate.json

@@ -0,0 +1,18 @@
+{
+  "extends": [
+    "config:base"
+  ],
+  "packageRules": [
+    {
+      "matchPackagePatterns": [
+        "*"
+      ],
+      "matchUpdateTypes": [
+        "minor",
+        "patch"
+      ],
+      "groupName": "all non-major dependencies",
+      "groupSlug": "all-minor-patch"
+    }
+  ]
+}