From 0658873eb2345adc7da5fefd5cffe846acf0c80c Mon Sep 17 00:00:00 2001
From: mr-impossibru <64555470+mr-impossibru@users.noreply.github.com>
Date: Wed, 12 Jan 2022 12:49:25 +0300
Subject: [PATCH] ft/BACKLOG-14/fix ci (#12)
---
.github/workflows/deploy.yml | 5 +----
.gitmodules | 4 ----
Jenkinsfile | 15 ---------------
README.md | 2 --
build_utils | 1 -
pom.xml | 3 ++-
6 files changed, 3 insertions(+), 27 deletions(-)
delete mode 100644 Jenkinsfile
delete mode 160000 build_utils
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 8c720c1..4a9acd1 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -28,7 +28,7 @@ jobs:
uses: actions/checkout@v2
with:
repository: valitydev/action-deploy-docker
- ref: v1.0.14
+ ref: v1.0.16
path: .github/actions/action-deploy-docker
- name: Run Build Java
@@ -42,8 +42,5 @@ jobs:
with:
registry-username: ${{ github.actor }}
registry-access-token: ${{ secrets.GITHUB_TOKEN }}
- aws-ecr-access-key: ${{ secrets.ECR_ACCESS_KEY }}
- aws-ecr-secret-key: ${{ secrets.ECR_SECRET_KEYS }}
- aws-region: ${{ secrets.AWS_REGION }}
env:
ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }}
\ No newline at end of file
diff --git a/.gitmodules b/.gitmodules
index ca5a761..e69de29 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,4 +0,0 @@
-[submodule "build_utils"]
- path = build_utils
- url = git@github.com:rbkmoney/build_utils.git
- branch = master
diff --git a/Jenkinsfile b/Jenkinsfile
deleted file mode 100644
index 2531d0b..0000000
--- a/Jenkinsfile
+++ /dev/null
@@ -1,15 +0,0 @@
-#!groovy
-build('proxy-mocketbank-mpi', 'java-maven') {
- checkoutRepo()
- loadBuildUtils()
-
- def javaServicePipeline
- runStage('load JavaService pipeline') {
- javaServicePipeline = load("build_utils/jenkins_lib/pipeJavaServiceInsideDocker.groovy")
- }
-
- def serviceName = env.REPO_NAME
- def mvnArgs = '-DjvmArgs="-Xmx256m"'
-
- javaServicePipeline(serviceName, mvnArgs)
-}
diff --git a/README.md b/README.md
index cd0613b..0254d3e 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,5 @@
# proxy-mocketbank-mpi
-[![Build Status](http://ci.rbkmoney.com/buildStatus/icon?job=rbkmoney_private/proxy-mocketbank-mpi/master)](http://ci.rbkmoney.com/job/rbkmoney_private/proxy-mocketbank-mpi/master)
-
Сервис предназначен для эмулирования работы с 3DS MPI
diff --git a/build_utils b/build_utils
deleted file mode 160000
index a87ebf3..0000000
--- a/build_utils
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit a87ebf3ae5e56910dc6a0edcac7f90565368a3d1
diff --git a/pom.xml b/pom.xml
index 535dab9..96443c2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
UTF-8
Anatoly Cherkasov <a.cherkasov@rbkmoney.com>
1.4.0
- c0612d6052ac049496b72a23a04acb142035f249
+ 7e0c98bb
@@ -57,6 +57,7 @@
com.rbkmoney
shared-resources
+ ${shared-resources.version}