Skip to content

Commit 0822b6b

Browse files
artem-vartem-v
committed
Added bom
1 parent 4e1aafb commit 0822b6b

File tree

6 files changed

+206
-114
lines changed

6 files changed

+206
-114
lines changed

‎.github/workflows/for-library/feature-ci.yml‎ renamed to ‎.github/workflows/branch-ci.yml‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,17 @@
1-
name: Feature Branch CI
1+
name: Branch CI
22

33
on:
44
push:
55
paths-ignore:
6-
- 'charts/**'
76
- '.github/workflows/**'
8-
- 'README.md'
7+
- '*.md'
8+
- '*.txt'
99
branches-ignore:
10-
- 'master'
11-
- 'develop'
1210
- 'release*'
1311

1412
jobs:
1513
build:
16-
name: Feature Branch CI
14+
name: Branch CI
1715
runs-on: ubuntu-latest
1816
steps:
1917
- uses: actions/checkout@v2
@@ -23,12 +21,13 @@ jobs:
2321
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
2422
restore-keys: |
2523
${{ runner.os }}-maven-
26-
- name: Set up JDK
24+
- name: Set up JDK 1.8
2725
uses: actions/setup-java@v1
2826
with:
29-
java-version: 17
30-
- name: Set up Maven
31-
run: cp build.settings.xml ~/.m2/settings.xml
27+
java-version: 1.8
28+
server-id: github
29+
server-username: GITHUB_ACTOR
30+
server-password: GITHUB_TOKEN
3231
- name: Maven Build
3332
run: mvn clean install -DskipTests=true -Dmaven.javadoc.skip=true -Ddockerfile.skip=true -B -V
3433
env:

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

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

‎.github/workflows/for-service/ci.yml‎

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

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

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
name: Pre-release CI
2+
3+
on:
4+
release:
5+
types: [prereleased]
6+
7+
jobs:
8+
build:
9+
name: Pre-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 Java for publishing to GitHub Packages
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 pre-release version to GitHub Packages
27+
run: |
28+
pre_release_version=${{ github.event.release.tag_name }}
29+
echo Pre-release version $pre_release_version
30+
mvn versions:set -DnewVersion=$pre_release_version -DgenerateBackupPoms=false
31+
mvn versions:commit
32+
mvn clean deploy -Pdeploy2Github -B -V
33+
env:
34+
GITHUB_TOKEN: ${{ secrets.ORGANIZATION_TOKEN }}
35+
- name: Set up Java for publishing to Maven Central Repository
36+
uses: actions/setup-java@v1
37+
with:
38+
java-version: 1.8
39+
server-id: ossrh
40+
server-username: MAVEN_USERNAME
41+
server-password: MAVEN_PASSWORD
42+
gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
43+
gpg-passphrase: MAVEN_GPG_PASSPHRASE
44+
- name: Deploy pre-release version to the Maven Central Repository
45+
run: |
46+
pre_release_version=${{ github.event.release.tag_name }}
47+
echo Pre-release version $pre_release_version
48+
mvn versions:set -DnewVersion=$pre_release_version -DgenerateBackupPoms=false
49+
mvn versions:commit
50+
mvn deploy -Pdeploy2Maven -DskipTests -B -V
51+
env:
52+
MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
53+
MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
54+
MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
55+
- name: Rollback pre-release (remove tag)
56+
if: failure()
57+
run: git push origin :refs/tags/${{ github.event.release.tag_name }}

‎.github/workflows/for-library/master-ci.yml‎ renamed to ‎.github/workflows/release-ci.yml‎

Lines changed: 33 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,31 @@
1-
name: Master branch CI
1+
name: Release CI
22

33
on:
4-
push:
5-
branches:
6-
- 'master'
4+
release:
5+
types: [released]
76

87
jobs:
98
build:
10-
name: Master Branch CI
9+
name: Release CI
1110
runs-on: ubuntu-latest
1211
steps:
1312
- uses: actions/checkout@v2
1413
with:
1514
fetch-depth: 0
15+
- run: git checkout ${{ github.event.release.target_commitish }}
1616
- uses: actions/cache@v1
1717
with:
1818
path: ~/.m2/repository
1919
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
2020
restore-keys: |
2121
${{ runner.os }}-maven-
22-
- name: Set up JDK
22+
- name: Set up Java for publishing to GitHub Packages
2323
uses: actions/setup-java@v1
2424
with:
25-
java-version: 17
26-
- name: Set up Maven
27-
run: cp build.settings.xml ~/.m2/settings.xml
25+
java-version: 1.8
26+
server-id: github
27+
server-username: GITHUB_ACTOR
28+
server-password: GITHUB_TOKEN
2829
- name: Maven Build
2930
run: mvn clean install -DskipTests=true -Ddockerfile.skip=true -B -V
3031
env:
@@ -33,29 +34,45 @@ jobs:
3334
run: mvn verify -B
3435
- name: Configure git
3536
run: |
36-
echo "Git checkout branch ${GITHUB_REF##*/}, commit ${GITHUB_SHA} was pushed by ${GITHUB_ACTOR}"
37-
git checkout ${GITHUB_REF##*/}
38-
echo "Git reset hard to ${GITHUB_SHA}"
39-
git reset --hard ${GITHUB_SHA}
4037
git config --global user.email "${GITHUB_ACTOR}@users.noreply.github.com"
4138
git config --global user.name "${GITHUB_ACTOR}"
4239
- name: Prepare release
4340
id: prepare_release
4441
run: |
4542
mvn -B build-helper:parse-version release:prepare \
4643
-DreleaseVersion=\${parsedVersion.majorVersion}.\${parsedVersion.minorVersion}.\${parsedVersion.incrementalVersion} \
47-
-DdevelopmentVersion=\${parsedVersion.majorVersion}.\${parsedVersion.minorVersion}.\${parsedVersion.nextIncrementalVersion}-SNAPSHOT \
48-
-Darguments="-DskipTests=true"
44+
-Darguments="-DskipTests=true -Ddockerfile.skip=true"
4945
echo ::set-output name=release_tag::$(git describe --tags --abbrev=0)
5046
- name: Perform release
51-
run: mvn -B release:perform -Darguments="-DskipTests=true -Ddocker.image.extra-tag=master"
47+
run: mvn -B release:perform -Pdeploy2Github -Darguments="-DskipTests=true -Ddockerfile.skip=true -Pdeploy2Github"
5248
env:
5349
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5450
GITHUB_REPOSITORY: ${{ secrets.GITHUB_REPOSITORY }}
51+
- name: Set up Java for publishing to Maven Central Repository
52+
uses: actions/setup-java@v1
53+
with:
54+
java-version: 1.8
55+
server-id: ossrh
56+
server-username: MAVEN_USERNAME
57+
server-password: MAVEN_PASSWORD
58+
gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
59+
gpg-passphrase: MAVEN_GPG_PASSPHRASE
60+
- name: Deploy release version to the Maven Central Repository
61+
run: |
62+
release_version=$(echo ${{ steps.prepare_release.outputs.release_tag }} | sed "s/release-//")
63+
echo release version $release_version
64+
mvn versions:set -DnewVersion=$release_version -DgenerateBackupPoms=false
65+
mvn versions:commit
66+
mvn deploy -Pdeploy2Maven -DskipTests -B -V
67+
env:
68+
MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
69+
MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
70+
MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
5571
- name: Rollback release
5672
if: failure()
5773
run: |
5874
mvn release:rollback || echo "nothing to rollback"
75+
git push origin :refs/tags/${{ github.event.release.tag_name }}
5976
if [ ! -z "${{ steps.prepare_release.outputs.release_tag }}" ]
6077
then
6178
git tag -d ${{ steps.prepare_release.outputs.release_tag }}

0 commit comments

Comments
 (0)