Skip to content

Commit 9711abc

Browse files
committed
Merge remote-tracking branch 'origin/feat/SupportLinuxArm' into feat/SupportLinuxArm
2 parents 659dc44 + 0e553ef commit 9711abc

File tree

6 files changed

+50
-10
lines changed

6 files changed

+50
-10
lines changed

.github/workflows/ci.yml

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ jobs:
2121
- name: Checkout LFS objects
2222
run: git lfs checkout
2323

24-
2524
- name: Cache local Maven repository
2625
uses: actions/cache@v4
2726
with:
@@ -57,15 +56,31 @@ jobs:
5756
echo "cx-mac binary does not exist"; exit 1;
5857
fi
5958
60-
- name: Run tests with Maven
61-
run: mvn -B test --file pom.xml
59+
- name: Install xmllint
60+
run: sudo apt-get install -y libxml2-utils
61+
62+
- name: Run tests with JaCoCo
63+
run: mvn test jacoco:report
6264
env:
6365
CX_CLIENT_ID: ${{ secrets.CX_CLIENT_ID}}
6466
CX_CLIENT_SECRET: ${{ secrets.CX_CLIENT_SECRET}}
6567
CX_BASE_URI: ${{ secrets.CX_BASE_URI }}
6668
CX_TENANT: ${{ secrets.CX_TENANT }}
6769
CX_APIKEY: ${{ secrets.CX_APIKEY }}
6870

71+
- name: Print total coverage percentage
72+
run: |
73+
COVERED_LINES=$(xmllint --xpath "string(//report/counter[@type='LINE']/@covered)" target/site/jacoco/jacoco.xml)
74+
MISSED_LINES=$(xmllint --xpath "string(//report/counter[@type='LINE']/@missed)" target/site/jacoco/jacoco.xml)
75+
TOTAL_LINES=$((COVERED_LINES + MISSED_LINES))
76+
COVERAGE_PERCENTAGE=$(echo "scale=2; $COVERED_LINES / $TOTAL_LINES * 100" | bc)
77+
echo "Total coverage percentage: $COVERAGE_PERCENTAGE%"
78+
79+
- name: Upload JaCoCo coverage report
80+
uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392 #v4
81+
with:
82+
name: jacoco-coverage-report
83+
path: target/site/jacoco
6984

7085
- name: Build with Maven
7186
run: mvn -B verify -DskipTests -Dgpg.skip --file pom.xml

checkmarx-ast-cli.version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.3.9
1+
2.3.10

pom.xml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,31 @@
6161

6262
<build>
6363
<plugins>
64+
<plugin>
65+
<groupId>org.jacoco</groupId>
66+
<artifactId>jacoco-maven-plugin</artifactId>
67+
<version>0.8.8</version>
68+
<executions>
69+
<execution>
70+
<goals>
71+
<goal>prepare-agent</goal>
72+
</goals>
73+
</execution>
74+
<execution>
75+
<id>report</id>
76+
<phase>test</phase>
77+
<goals>
78+
<goal>report</goal>
79+
</goals>
80+
<configuration>
81+
<includes>
82+
<include>**/src/main/java/**</include>
83+
<!-- Add other patterns as needed -->
84+
</includes>
85+
</configuration>
86+
</execution>
87+
</executions>
88+
</plugin>
6489
<plugin>
6590
<groupId>com.github.spotbugs</groupId>
6691
<artifactId>spotbugs-maven-plugin</artifactId>

src/main/resources/cx-linux

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:1c4afe8c81b2de2f923d6d97d6e814ae8397988861f77149cf9681b121c82add
3-
size 66457752
2+
oid sha256:412a2dc0b2d5fbd420221917bef0a20fb0da3cc73b4ed5e33f8c11ae6cb14ff3
3+
size 68751512

src/main/resources/cx-mac

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:09cdae9eaad0deb0200531d9f19d9c5181a5ef70c395bfb50a9c219ea2a11d87
3-
size 134615952
2+
oid sha256:cae6edfb19ce82528f889ff5f292d0926593ac3a780483b0cc32bfe7676163cc
3+
size 139143424

src/main/resources/cx.exe

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:49fbf8c71340c4ca79e3396522ee45a25e2389f69e54ed2cb666074973467ad9
3-
size 68230528
2+
oid sha256:a4479743917968e0328c95c8760a9fdf60d8ddc1efe634a87d15623535aa83b9
3+
size 70566272

0 commit comments

Comments
 (0)