Skip to content

Commit ff8264e

Browse files
Simplify building (#10)
1 parent 07cea1c commit ff8264e

3 files changed

Lines changed: 7 additions & 45 deletions

File tree

.github/workflows/release.yaml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,22 +21,20 @@ jobs:
2121
distribution: 'temurin'
2222
server-id: github
2323
settings-path: ${{ github.workspace }}
24-
gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
25-
gpg-passphrase: MAVEN_GPG_PASSPHRASE
2624

27-
- name: Publish to GitHub Packages
28-
run: mvn --batch-mode -Drevision=${{ github.event.release.tag_name }} -Dsha1= -Dchangelist= clean deploy -Ppublish-github-packages
25+
- name: Build jar
26+
run: mvn --batch-mode -Drevision=${{ github.event.release.tag_name }} -Dsha1= -Dchangelist= clean package
2927
env:
3028
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
31-
MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
3229

3330
- name: Pack RPM
3431
run: cd rpm/ && mvn --batch-mode -Drevision=${{ github.event.release.tag_name }} -Dsha1= -Dchangelist= -f rpm.pom.xml package
3532
env:
3633
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
37-
MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
3834

3935
- name: Attach rpm to release
4036
uses: softprops/action-gh-release@v1
4137
with:
42-
files: rpm/target/rpm/com.teragrep-rlp_09/RPMS/noarch/com.teragrep-rlp_09-*.noarch.rpm
38+
files: |
39+
rpm/target/rpm/com.teragrep-rlp_09/RPMS/noarch/com.teragrep-rlp_09-*.noarch.rpm
40+
target/rlp_09-*-jar-with-dependencies.jar

pom.xml

Lines changed: 1 addition & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
</dependency>
3838
</dependencies>
3939
<build>
40-
<finalName>${artifactId}</finalName>
40+
<finalName>${artifactId}-${revision}${changelist}${sha1}</finalName>
4141
<plugins>
4242
<plugin>
4343
<groupId>org.apache.rat</groupId>
@@ -157,40 +157,4 @@
157157
</plugin>
158158
</plugins>
159159
</build>
160-
<profiles>
161-
<profile>
162-
<id>publish-github-packages</id>
163-
<build>
164-
<plugins>
165-
<plugin>
166-
<groupId>org.apache.maven.plugins</groupId>
167-
<artifactId>maven-gpg-plugin</artifactId>
168-
<version>3.1.0</version>
169-
<executions>
170-
<execution>
171-
<id>sign-artifacts</id>
172-
<phase>verify</phase>
173-
<goals>
174-
<goal>sign</goal>
175-
</goals>
176-
<configuration>
177-
<gpgArguments>
178-
<arg>--pinentry-mode</arg>
179-
<arg>loopback</arg>
180-
</gpgArguments>
181-
</configuration>
182-
</execution>
183-
</executions>
184-
</plugin>
185-
</plugins>
186-
</build>
187-
<distributionManagement>
188-
<repository>
189-
<id>github</id>
190-
<name>GitHub Packages</name>
191-
<url>https://maven.pkg.github.com/${env.GITHUB_REPOSITORY}</url>
192-
</repository>
193-
</distributionManagement>
194-
</profile>
195-
</profiles>
196160
</project>

rpm/rpm.pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989
<recurseDirectories>true</recurseDirectories>
9090
<sources>
9191
<source>
92-
<location>${project.basedir}/../target/rlp_09-jar-with-dependencies.jar</location>
92+
<location>${project.basedir}/../target/rlp_09-${revision}${sha1}${changelist}-jar-with-dependencies.jar</location>
9393
<destination>rlp_09.jar</destination>
9494
</source>
9595
</sources>

0 commit comments

Comments
 (0)