Skip to content

Commit e05fe92

Browse files
AXEPOHAXEPOH
committed
Merge branch 'DBTOOLS-1667_deploy_cli' into 'master'
DBTOOLS-1667 added deploy cli See merge request codekeeper/pgcodekeeper-cli!4
2 parents d7bf72f + 665fd5f commit e05fe92

File tree

3 files changed

+98
-13
lines changed

3 files changed

+98
-13
lines changed

‎.github/workflows/release.yaml‎

Lines changed: 47 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,50 @@ jobs:
1111
steps:
1212

1313
- name: checkout
14-
uses: actions/checkout@v4
14+
uses: actions/checkout@v4
15+
16+
- name: set up JDK 17
17+
uses: actions/setup-java@v4
18+
with:
19+
distribution: 'temurin'
20+
java-version: '17'
21+
22+
- name: build
23+
run: mvn -B clean package -DskipTests
24+
25+
- name: set cli build name for zip
26+
run: echo "CLI_BUILD_ZIP=pgCodeKeeper-cli-${{ env.RELEASE_VERSION }}.zip" >> $GITHUB_ENV
27+
28+
- name: set cli build name for jar
29+
run: echo "CLI_BUILD_JAR=pgCodeKeeper-cli-${{ env.RELEASE_VERSION }}.jar" >> $GITHUB_ENV
30+
31+
- name: create GitHub release
32+
id: create_release
33+
uses: comnoco/create-release-action@v2.0.5
34+
env:
35+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
36+
with:
37+
tag_name: ${{ env.RELEASE_VERSION }}
38+
release_name: pgCodeKeeper ${{ env.RELEASE_VERSION }}
39+
draft: false
40+
prerelease: false
41+
42+
- name: upload release zip cli build
43+
uses: sekwah41/upload-release-assets@main
44+
env:
45+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
46+
with:
47+
upload_url: ${{ steps.create_release.outputs.upload_url }}
48+
asset_path: ${{ github.workspace }}/target/${{ env.CLI_BUILD_ZIP }}
49+
asset_name: ${{ env.CLI_BUILD_ZIP }}
50+
asset_content_type: application/zip
51+
52+
- name: upload release jar cli build
53+
uses: sekwah41/upload-release-assets@main
54+
env:
55+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
56+
with:
57+
upload_url: ${{ steps.create_release.outputs.upload_url }}
58+
asset_path: ${{ github.workspace }}/target/${{ env.CLI_BUILD_JAR }}
59+
asset_name: ${{ env.CLI_BUILD_JAR }}
60+
asset_content_type: application/java-archive

‎pom.xml‎

Lines changed: 23 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -86,22 +86,33 @@
8686
<goals>
8787
<goal>single</goal>
8888
</goals>
89+
<configuration>
90+
<archive>
91+
<manifest>
92+
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
93+
<mainClass>${mainClass}</mainClass>
94+
</manifest>
95+
</archive>
96+
<descriptorRefs>
97+
<descriptorRef>jar-with-dependencies</descriptorRef>
98+
</descriptorRefs>
99+
</configuration>
100+
</execution>
101+
<execution>
102+
<id>create-distribution</id>
103+
<phase>package</phase>
104+
<goals>
105+
<goal>single</goal>
106+
</goals>
107+
<configuration>
108+
<descriptors>
109+
<descriptor>scripts/assembly.xml</descriptor>
110+
</descriptors>
111+
</configuration>
89112
</execution>
90113
</executions>
91114
<configuration>
92-
<archive>
93-
<manifest>
94-
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
95-
<mainClass>${mainClass}</mainClass>
96-
</manifest>
97-
<manifestEntries>
98-
<Multi-Release>true</Multi-Release>
99-
</manifestEntries>
100-
</archive>
101115
<appendAssemblyId>false</appendAssemblyId>
102-
<descriptorRefs>
103-
<descriptorRef>jar-with-dependencies</descriptorRef>
104-
</descriptorRefs>
105116
<finalName>${project.artifactId}-${project.version}</finalName>
106117
</configuration>
107118
</plugin>

‎scripts/assembly.xml‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
2+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
4+
<id>distribution</id>
5+
<formats>
6+
<format>zip</format>
7+
</formats>
8+
<includeBaseDirectory>false</includeBaseDirectory>
9+
<fileSets>
10+
<fileSet>
11+
<directory>target</directory>
12+
<outputDirectory></outputDirectory>
13+
<includes>
14+
<include>*.jar</include>
15+
</includes>
16+
</fileSet>
17+
</fileSets>
18+
<files>
19+
<file>
20+
<source>scripts/pgcodekeeper-cli.bat</source>
21+
<outputDirectory></outputDirectory>
22+
</file>
23+
<file>
24+
<source>scripts/pgcodekeeper-cli.sh</source>
25+
<outputDirectory></outputDirectory>
26+
</file>
27+
</files>
28+
</assembly>

0 commit comments

Comments
 (0)