Skip to content

Commit 13d3ea4

Browse files
committed
try different way of merging via docker image
1 parent 8ce6677 commit 13d3ea4

File tree

4 files changed

+3
-8
lines changed

4 files changed

+3
-8
lines changed

.github/workflows/javaTests.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -103,12 +103,6 @@ jobs:
103103
ARTIFACT_NAME=${ARTIFACT_NAME//\*/x} # replace * with x
104104
echo "ARTIFACT_NAME=$ARTIFACT_NAME" >> $GITHUB_ENV
105105
106-
- name: Merge Jacoco SingleTest Artifacts
107-
run: |
108-
chown $(whoami) target/jacoco.exec
109-
mvn jacoco:merge
110-
111-
112106
- name: Save Java Test Coverage as Artifact
113107
uses: actions/upload-artifact@v4
114108
with:

docker/entrypoint.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ export MAVEN_OPTS="-Xmx512m"
3131
log="/tmp/sysdstest.log"
3232
mvn -ntp -B test-compile 2>&1 | grep -E "BUILD|Total time:|---|Building SystemDS"
3333
mvn -ntp -B test -D maven.test.skip=false -D automatedtestbase.outputbuffering=true -D test=$1 2>&1 | grep -v "already exists in destination." | tee $log
34+
mvn -ntp -B jacoco:merge
3435

3536
grep_args="SUCCESS"
3637
grepvals="$( tail -n 100 $log | grep $grep_args)"

docker/sysds.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#
2020
#-------------------------------------------------------------
2121

22-
FROM ubuntu:24.04
22+
FROM ubuntu:24.04@sha256:6015f66923d7afbc53558d7ccffd325d43b4e249f41a6e93eef074c9505d2233
2323

2424
WORKDIR /usr/src/
2525

docker/testsysds.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#
2020
#-------------------------------------------------------------
2121

22-
FROM ubuntu:24.04
22+
FROM ubuntu:24.04@sha256:6015f66923d7afbc53558d7ccffd325d43b4e249f41a6e93eef074c9505d2233
2323

2424

2525
WORKDIR /usr/src/

0 commit comments

Comments
 (0)