Loading .gitlab-ci.yml +5 −3 Original line number Diff line number Diff line Loading @@ -238,10 +238,10 @@ stages: .build-merge-target-binaries: &build-merge-target-binaries - current_commit_sha=$(git rev-parse HEAD) ### build merge target binaries - if [ -f $MERGE_REQUEST_TARGET_FILE ]; then - MERGE_REQUEST_TARGET=$(echo $MERGE_REQUEST_TARGET_FILE) - if [ -f $MERGE_TARGET_COMMIT_FILE ]; then - MERGE_REQUEST_TARGET=$(echo $MERGE_TARGET_COMMIT_FILE) - else - echo "MERGE_REQUEST_TARGET_FILE does not exist, exiting!" - echo "MERGE_TARGET_COMMIT_FILE does not exist, exiting!" - exit 1 - fi - git checkout $MERGE_REQUEST_TARGET Loading Loading @@ -2161,6 +2161,7 @@ voip-be-on-merge-request: renderer-pytest-on-merge-request: extends: - .test-job-linux-needs-testv-dir - .test-job-linux-needs-fixed-target - .rules-merge-request-to-main-pc needs: ["build-codec-linux-make"] # TODO: set reasonable timeout, will most likely take less Loading Loading @@ -2217,6 +2218,7 @@ renderer-pytest-on-merge-request: ivas-pytest-on-merge-request: extends: - .test-job-linux-needs-testv-dir - .test-job-linux-needs-fixed-target - .rules-merge-request-to-main-pc stage: compare # TODO: broken dependency needs to be removed temporarily, see above Loading Loading
.gitlab-ci.yml +5 −3 Original line number Diff line number Diff line Loading @@ -238,10 +238,10 @@ stages: .build-merge-target-binaries: &build-merge-target-binaries - current_commit_sha=$(git rev-parse HEAD) ### build merge target binaries - if [ -f $MERGE_REQUEST_TARGET_FILE ]; then - MERGE_REQUEST_TARGET=$(echo $MERGE_REQUEST_TARGET_FILE) - if [ -f $MERGE_TARGET_COMMIT_FILE ]; then - MERGE_REQUEST_TARGET=$(echo $MERGE_TARGET_COMMIT_FILE) - else - echo "MERGE_REQUEST_TARGET_FILE does not exist, exiting!" - echo "MERGE_TARGET_COMMIT_FILE does not exist, exiting!" - exit 1 - fi - git checkout $MERGE_REQUEST_TARGET Loading Loading @@ -2161,6 +2161,7 @@ voip-be-on-merge-request: renderer-pytest-on-merge-request: extends: - .test-job-linux-needs-testv-dir - .test-job-linux-needs-fixed-target - .rules-merge-request-to-main-pc needs: ["build-codec-linux-make"] # TODO: set reasonable timeout, will most likely take less Loading Loading @@ -2217,6 +2218,7 @@ renderer-pytest-on-merge-request: ivas-pytest-on-merge-request: extends: - .test-job-linux-needs-testv-dir - .test-job-linux-needs-fixed-target - .rules-merge-request-to-main-pc stage: compare # TODO: broken dependency needs to be removed temporarily, see above Loading