From 6e90fd145f4d190e3b0ec2f10b3463bae038d859 Mon Sep 17 00:00:00 2001
From: vharseko <vharseko@3a-systems.ru>
Date: Tue, 29 Nov 2022 09:35:00 +0000
Subject: [PATCH] UPDATE build process (#262)
---
.github/workflows/deploy.yml | 4 ++--
.github/workflows/release.yml | 23 ++++++++++++-----------
.github/workflows/build.yml | 18 +++++++++---------
pom.xml | 7 ++++++-
4 files changed, 29 insertions(+), 23 deletions(-)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 2aed24e..9eecda8 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -43,7 +43,7 @@
fetch-depth: 0
submodules: recursive
- name: Java ${{ matrix.Java }} (${{ matrix.os }})
- uses: actions/setup-java@v2
+ uses: actions/setup-java@v3
with:
java-version: ${{ matrix.java }}
distribution: 'temurin'
@@ -104,7 +104,7 @@
echo "release_version=$git_version_last" >> $GITHUB_ENV
- name: Docker meta
id: meta
- uses: docker/metadata-action@v3
+ uses: docker/metadata-action@v4
with:
images: |
localhost:5000/${{ github.repository }}
@@ -112,13 +112,13 @@
type=raw,value=latest
type=raw,value=${{ env.release_version }}
- name: Set up QEMU
- uses: docker/setup-qemu-action@v1
+ uses: docker/setup-qemu-action@v2
- name: Set up Docker Buildx
- uses: docker/setup-buildx-action@v1
+ uses: docker/setup-buildx-action@v2
with:
driver-opts: network=host
- name: Build image (default)
- uses: docker/build-push-action@v2
+ uses: docker/build-push-action@v3
continue-on-error: true
with:
context: ./opendj-packages/opendj-docker
@@ -153,7 +153,7 @@
echo "release_version=$git_version_last" >> $GITHUB_ENV
- name: Docker meta
id: meta
- uses: docker/metadata-action@v3
+ uses: docker/metadata-action@v4
with:
images: |
localhost:5000/${{ github.repository }}
@@ -161,14 +161,14 @@
type=raw,value=alpine
type=raw,value=${{ env.release_version }}-alpine
- name: Set up QEMU
- uses: docker/setup-qemu-action@v1
+ uses: docker/setup-qemu-action@v2
- name: Set up Docker Buildx
- uses: docker/setup-buildx-action@v1
+ uses: docker/setup-buildx-action@v2
with:
driver-opts: network=host
- name: Build image
continue-on-error: true
- uses: docker/build-push-action@v2
+ uses: docker/build-push-action@v3
with:
context: ./opendj-packages/opendj-docker
file: ./opendj-packages/opendj-docker/Dockerfile-alpine
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 5b086d6..f6ad02d 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -44,7 +44,7 @@
fetch-depth: 0
submodules: recursive
- name: Set up Java for publishing to Maven Central Repository OSS
- uses: actions/setup-java@v2
+ uses: actions/setup-java@v3
with:
java-version: '8'
distribution: 'temurin'
@@ -52,7 +52,7 @@
server-username: MAVEN_USERNAME
server-password: MAVEN_PASSWORD
- name: Cache Maven packages
- uses: actions/cache@v2
+ uses: actions/cache@v3
with:
path: ~/.m2/repository
key: ${{ runner.os }}-m2-repository-${{ hashFiles('**/pom.xml') }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 7225b23..00365ef 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -48,7 +48,7 @@
fetch-depth: 0
submodules: recursive
- name: Set up Java for publishing to Maven Central Repository OSS
- uses: actions/setup-java@v2
+ uses: actions/setup-java@v3
with:
java-version: '8'
distribution: 'temurin'
@@ -56,7 +56,7 @@
server-username: MAVEN_USERNAME
server-password: MAVEN_PASSWORD
- name: Cache Maven packages
- uses: actions/cache@v2
+ uses: actions/cache@v3
with:
path: ~/.m2/repository
key: ${{ runner.os }}-m2-repository-${{ hashFiles('**/pom.xml') }}
@@ -68,6 +68,7 @@
run: |
cat <(echo -e "${{ secrets.GPG_PRIVATE_KEY }}") | gpg --batch --import
gpg --list-secret-keys --keyid-format LONG
+ git config --global user.signingkey B02611B009E5302EB58D102D6C2EDF3C90D33841
- name: Configure Git User
run: |
git config --global user.name "Open Identity Platform Community"
@@ -80,7 +81,7 @@
MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
MAVEN_OPTS: -Dhttps.protocols=TLSv1.2 -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 -Dmaven.wagon.http.retryHandler.requestSentEnabled=true -Dmaven.wagon.http.retryHandler.count=10
if: ${{ env.MAVEN_USERNAME!='' && env.MAVEN_PASSWORD!='' }}
- run: mvn --batch-mode -Darguments="-Dgpg.passphrase=${{ secrets.GPG_PASSPHRASE }}" -DtagNameFormat="${{ github.event.inputs.releaseVersion }}" -DreleaseVersion=${{ github.event.inputs.releaseVersion }} -DdevelopmentVersion=${{ github.event.inputs.developmentVersion }} release:prepare release:perform --file pom.xml
+ run: mvn --batch-mode -Darguments="-Dgpg.passphrase=${{ secrets.GPG_PASSPHRASE }}" -DsignTag=true -DtagNameFormat="${{ github.event.inputs.releaseVersion }}" -DreleaseVersion=${{ github.event.inputs.releaseVersion }} -DdevelopmentVersion=${{ github.event.inputs.developmentVersion }} release:prepare release:perform --file pom.xml
- name: Release on GitHub
uses: softprops/action-gh-release@v1
with:
@@ -135,7 +136,7 @@
submodules: recursive
- name: Docker meta
id: meta
- uses: docker/metadata-action@v3
+ uses: docker/metadata-action@v4
with:
images: |
${{ github.repository }}
@@ -144,9 +145,9 @@
type=raw,value=latest
type=raw,value=${{ github.event.inputs.releaseVersion }}
- name: Set up QEMU
- uses: docker/setup-qemu-action@v1
+ uses: docker/setup-qemu-action@v2
- name: Set up Docker Buildx
- uses: docker/setup-buildx-action@v1
+ uses: docker/setup-buildx-action@v2
- name: Login to DockerHub
uses: docker/login-action@v1
with:
@@ -159,7 +160,7 @@
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: Build and push image
- uses: docker/build-push-action@v2
+ uses: docker/build-push-action@v3
continue-on-error: true
with:
context: ./opendj-packages/opendj-docker
@@ -183,7 +184,7 @@
submodules: recursive
- name: Docker meta
id: meta
- uses: docker/metadata-action@v3
+ uses: docker/metadata-action@v4
with:
images: |
${{ github.repository }}
@@ -192,9 +193,9 @@
type=raw,value=alpine
type=raw,value=${{ github.event.inputs.releaseVersion }}-alpine
- name: Set up QEMU
- uses: docker/setup-qemu-action@v1
+ uses: docker/setup-qemu-action@v2
- name: Set up Docker Buildx
- uses: docker/setup-buildx-action@v1
+ uses: docker/setup-buildx-action@v2
- name: Login to DockerHub
uses: docker/login-action@v1
with:
@@ -208,7 +209,7 @@
password: ${{ secrets.GITHUB_TOKEN }}
- name: Build and push image
continue-on-error: true
- uses: docker/build-push-action@v2
+ uses: docker/build-push-action@v3
with:
context: ./opendj-packages/opendj-docker
file: ./opendj-packages/opendj-docker/Dockerfile-alpine
diff --git a/pom.xml b/pom.xml
index cdcd642..69a73c3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -375,7 +375,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
- <version>3.0.0-M1</version>
+ <version>3.0.0-M7</version>
+ <configuration>
+ <signTag>true</signTag>
+ <tagNameFormat>@{project.version}</tagNameFormat>
+ <allowTimestampedSnapshots>false</allowTimestampedSnapshots>
+ </configuration>
</plugin>
<plugin>
--
Gitblit v1.10.0