Skip to content

Commit 283207e

Browse files
committed
Use DDCI_PULL_REQUEST_TARGET_SHA
1 parent 3fc64a1 commit 283207e

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

.gitlab-ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ build_tests:
225225
script:
226226
- |
227227
if [[ ! $CI_COMMIT_BRANCH =~ ^(master|release/.*)$ ]]; then
228-
export GRADLE_PARAMS="$GRADLE_PARAMS -PgitBaseRef=origin/$CI_DEFAULT_BRANCH"
228+
export GRADLE_PARAMS="$GRADLE_PARAMS -PgitBaseRef=$DDCI_PULL_REQUEST_TARGET_SHA"
229229
fi
230230
- ./gradlew clean $GRADLE_TARGET $GRADLE_PARAMS -PskipTests $GRADLE_ARGS
231231

@@ -333,7 +333,7 @@ test_published_artifacts:
333333
script:
334334
- |
335335
if [[ ! $CI_COMMIT_BRANCH =~ ^(master|release/.*)$ ]]; then
336-
export GRADLE_PARAMS="$GRADLE_PARAMS -PgitBaseRef=origin/$CI_DEFAULT_BRANCH"
336+
export GRADLE_PARAMS="$GRADLE_PARAMS -PgitBaseRef=$DDCI_PULL_REQUEST_TARGET_SHA"
337337
fi
338338
- ./gradlew $GRADLE_TARGET $GRADLE_PARAMS -PskipTests -PrunBuildSrcTests -PskipSpotless -PtaskPartitionCount=$NORMALIZED_NODE_TOTAL -PtaskPartition=$NORMALIZED_NODE_INDEX $GRADLE_ARGS
339339
after_script:
@@ -470,7 +470,7 @@ muzzle-dep-report:
470470
script:
471471
- |
472472
if [[ ! $CI_COMMIT_BRANCH =~ ^(master|release/.*)$ ]]; then
473-
export GRADLE_PARAMS="$GRADLE_PARAMS -PgitBaseRef=origin/$CI_DEFAULT_BRANCH"
473+
export GRADLE_PARAMS="$GRADLE_PARAMS -PgitBaseRef=$DDCI_PULL_REQUEST_TARGET_SHA"
474474
fi
475475
- >
476476
if [ "$PROFILE_TESTS" == "true" ] && [ "$testJvm" != "ibm8" ] && [ "$testJvm" != "oracle8" ];

0 commit comments

Comments
 (0)