Skip to content
This repository was archived by the owner on Jun 21, 2023. It is now read-only.

Commit 512b2ef

Browse files
artem-vartem-v
authored
Merge pull request #167 from scalecube/develop
New master
2 parents 3f88444 + 19285a3 commit 512b2ef

19 files changed

+244
-448
lines changed

‎.editorconfig‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
root = true
2+
3+
[*]
4+
charset = utf-8
5+
end_of_line = lf
6+
indent_style = space
7+
indent_size = 2
8+
insert_final_newline = true
9+
trim_trailing_whitespace = true

‎.gitattributes‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# Auto detect text files and perform LF normalization
2+
* text=auto
3+
*.txt text
4+
*.sh text eol=lf
5+
*.html text eol=lf diff=html
6+
*.css text eol=lf
7+
*.js text eol=lf
8+
*.jpg -text
9+
*.pdf -text
10+
*.java text diff=java

‎.github/FUNDING.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
custom:
2+
- https://www.om2.com/
3+
- https://exberry.io/

‎.github/workflows/feature-ci.yml‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
name: Feature Branch CI
2+
3+
on:
4+
push:
5+
paths-ignore:
6+
- '.github/workflows/**'
7+
- 'README.md'
8+
branches-ignore:
9+
- 'master'
10+
- 'develop'
11+
- 'release*'
12+
13+
jobs:
14+
build:
15+
name: Feature Branch CI
16+
runs-on: ubuntu-latest
17+
steps:
18+
- uses: actions/checkout@v2
19+
- uses: actions/cache@v1
20+
with:
21+
path: ~/.m2/repository
22+
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
23+
restore-keys: |
24+
${{ runner.os }}-maven-
25+
- name: Set up JDK 1.8
26+
uses: actions/setup-java@v1
27+
with:
28+
java-version: 1.8
29+
server-id: github
30+
server-username: GITHUB_ACTOR
31+
server-password: GITHUB_TOKEN
32+
- name: Maven Build
33+
run: mvn clean install -DskipTests=true -Dmaven.javadoc.skip=true -Ddockerfile.skip=true -B -V
34+
env:
35+
GITHUB_TOKEN: ${{ secrets.ORGANIZATION_TOKEN }}
36+
- name: Maven Verify
37+
run: mvn verify -B

‎.github/workflows/master-ci.yml‎

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
name: Master branch CI
2+
3+
on:
4+
push:
5+
branches:
6+
- 'master'
7+
8+
jobs:
9+
build:
10+
name: Master Branch CI
11+
runs-on: ubuntu-latest
12+
steps:
13+
- uses: actions/checkout@v2
14+
with:
15+
fetch-depth: 0
16+
- uses: actions/cache@v1
17+
with:
18+
path: ~/.m2/repository
19+
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
20+
restore-keys: |
21+
${{ runner.os }}-maven-
22+
- name: Set up JDK 1.8
23+
uses: actions/setup-java@v1
24+
with:
25+
java-version: 1.8
26+
server-id: github
27+
server-username: GITHUB_ACTOR
28+
server-password: GITHUB_TOKEN
29+
- name: Maven Build
30+
run: mvn clean install -DskipTests=true -Ddockerfile.skip=true -B -V
31+
env:
32+
GITHUB_TOKEN: ${{ secrets.ORGANIZATION_TOKEN }}
33+
- name: Maven Verify
34+
run: mvn verify -B
35+
- name: Configure git
36+
run: |
37+
echo "Git checkout branch ${GITHUB_REF##*/}, commit ${GITHUB_SHA} was pushed by ${GITHUB_ACTOR}"
38+
git checkout ${GITHUB_REF##*/}
39+
echo "Git reset hard to ${GITHUB_SHA}"
40+
git reset --hard ${GITHUB_SHA}
41+
git config --global user.email "${GITHUB_ACTOR}@users.noreply.github.com"
42+
git config --global user.name "${GITHUB_ACTOR}"
43+
- name: Prepare release
44+
id: prepare_release
45+
run: |
46+
mvn --batch-mode build-helper:parse-version release:prepare -P release \
47+
-DreleaseVersion=\${parsedVersion.majorVersion}.\${parsedVersion.minorVersion}.\${parsedVersion.incrementalVersion} \
48+
-DdevelopmentVersion=\${parsedVersion.majorVersion}.\${parsedVersion.minorVersion}.\${parsedVersion.nextIncrementalVersion}-SNAPSHOT \
49+
-DautoVersionSubmodules=true -Darguments="-DskipTests=true"
50+
echo ::set-output name=release_tag::$(git describe --tags --abbrev=0)
51+
- name: Perform release
52+
run: mvn --batch-mode release:perform -P release -Darguments="-DskipTests=true -Ddocker.image.extra-tag=master"
53+
env:
54+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
55+
GITHUB_REPOSITORY: ${{ secrets.GITHUB_REPOSITORY }}
56+
- name: Rollback release
57+
if: failure()
58+
run: |
59+
mvn release:rollback || echo "nothing to rollback"
60+
if [ ! -z "${{ steps.prepare_release.outputs.release_tag }}" ]
61+
then
62+
git tag -d ${{ steps.prepare_release.outputs.release_tag }}
63+
git push origin :refs/tags/${{ steps.prepare_release.outputs.release_tag }}
64+
fi

‎.github/workflows/release-ci.yml‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
name: Release CI
2+
3+
on:
4+
release:
5+
types: [published]
6+
7+
jobs:
8+
build:
9+
name: Release CI
10+
runs-on: ubuntu-latest
11+
steps:
12+
- uses: actions/checkout@v2
13+
- uses: actions/cache@v1
14+
with:
15+
path: ~/.m2/repository
16+
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
17+
restore-keys: |
18+
${{ runner.os }}-maven-
19+
- name: Set up JDK 1.8
20+
uses: actions/setup-java@v1
21+
with:
22+
java-version: 1.8
23+
server-id: github
24+
server-username: GITHUB_ACTOR
25+
server-password: GITHUB_TOKEN
26+
- name: Deploy release version
27+
run: |
28+
# `tag` is the concatenation of `v` and a version by the tag convention.
29+
release_version=$(echo ${{ github.event.release.tag_name }} | sed "s/v//")
30+
echo Release version $release_version
31+
mvn versions:set -DnewVersion=$release_version -DgenerateBackupPoms=false
32+
mvn versions:commit
33+
mvn clean deploy -B -V
34+
env:
35+
GITHUB_TOKEN: ${{ secrets.ORGANIZATION_TOKEN }}
36+
- name: Rollback release (remove tag)
37+
if: failure()
38+
run: git push origin :refs/tags/${{ github.event.release.tag_name }}

‎.gitignore‎

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,13 @@
1-
# everything that starts with dot (hidden files)
21
.*
3-
# except this file
42
!.gitignore
5-
# except this file-extention
3+
!.gitattributes
4+
!.github
5+
!.editorconfig
66
!.*.yml
7-
8-
# Build targets
7+
!.env.example
98
**/target/
10-
11-
# logs and reports
9+
*.iml
10+
**/logs/*.log
11+
*.db
1212
*.csv
1313
*.log
14-
*.zip
15-
16-
# IntelliJ IDEA project files and directories
17-
*.iml
18-
19-
**/pom.xml.releaseBackup
20-
/release.properties

‎.travis.yml‎

Lines changed: 0 additions & 28 deletions
This file was deleted.

‎.yamllint.yml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
extends: default
2+
rules:
3+
document-start:
4+
present: false
5+
truthy: disable
6+
comments:
7+
min-spaces-from-content: 1
8+
line-length:
9+
max: 150
10+
braces:
11+
min-spaces-inside: 0
12+
max-spaces-inside: 0
13+
brackets:
14+
min-spaces-inside: 0
15+
max-spaces-inside: 0
16+
indentation:
17+
indent-sequences: consistent

‎CODE_OF_CONDUCT.md‎

Lines changed: 0 additions & 46 deletions
This file was deleted.

0 commit comments

Comments
 (0)