Skip to content

Commit 38ce380

Browse files
committedAug 9, 2023
Update RPM test
The RPM test has been updated to compare JAR files from RPM packages (which were built using XMvn) against JAR files built directly using Maven.
1 parent 99a927c commit 38ce380

File tree

1 file changed

+39
-3
lines changed

1 file changed

+39
-3
lines changed
 

‎.github/workflows/build-tests.yml

+39-3
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,8 @@ jobs:
8989
comm -23 --check-order /tmp/functions.txt /tmp/version.txt > /tmp/diff.txt
9090
test ! -s /tmp/diff.txt
9191
92-
rpminspect:
93-
name: RPMInspect
92+
rpm-test:
93+
name: RPM Test
9494
runs-on: ubuntu-latest
9595
container: 'fedora:latest'
9696
steps:
@@ -108,7 +108,7 @@ jobs:
108108
dnf install -y dnf-plugins-core rpm-build maven
109109
dnf builddep -y --spec jss.spec
110110
111-
- name: Build JSS RPMs with CMake
111+
- name: Build JSS RPMs with XMvn and CMake
112112
run: ./build.sh --work-dir=build rpm
113113

114114
- name: Install RPMInspect
@@ -120,6 +120,42 @@ jobs:
120120
- name: Run RPMInspect on SRPM and RPMs
121121
run: ./tests/bin/rpminspect.sh
122122

123+
- name: Install RPMs
124+
run: dnf localinstall -y build/RPMS/*.rpm
125+
126+
- name: Build JSS with Maven
127+
run: mvn -pl '!native,!symkey,!examples' package
128+
129+
- name: Compare jss.jar
130+
run: |
131+
jar tvf /usr/share/java/jss/jss.jar | awk '{print $8;}' | sort \
132+
| grep -v '/$' \
133+
| tee jss.jar.rpm
134+
jar tvf base/target/jss.jar | awk '{print $8;}' | sort \
135+
| grep -v '/$' \
136+
| tee jss.jar.maven
137+
diff jss.jar.rpm jss.jar.maven
138+
139+
- name: Compare jss-tomcat.jar
140+
run: |
141+
jar tvf /usr/share/java/jss/jss-tomcat.jar | awk '{print $8;}' | sort \
142+
| grep -v '/$' \
143+
| tee jss-tomcat.jar.rpm
144+
jar tvf tomcat/target/jss-tomcat.jar | awk '{print $8;}' | sort \
145+
| grep -v '/$' \
146+
| tee jss-tomcat.jar.maven
147+
diff jss-tomcat.jar.rpm jss-tomcat.jar.maven
148+
149+
- name: Compare jss-tomcat-9.0.jar
150+
run: |
151+
jar tvf /usr/share/java/jss/jss-tomcat-9.0.jar | awk '{print $8;}' | sort \
152+
| grep -v '/$' \
153+
| tee jss-tomcat-9.0.jar.rpm
154+
jar tvf tomcat-9.0/target/jss-tomcat-9.0.jar | awk '{print $8;}' | sort \
155+
| grep -v '/$' \
156+
| tee jss-tomcat-9.0.jar.maven
157+
diff jss-tomcat-9.0.jar.rpm jss-tomcat-9.0.jar.maven
158+
123159
sandbox-test:
124160
name: Sandbox Test
125161
runs-on: ubuntu-latest

0 commit comments

Comments
 (0)
Please sign in to comment.