diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 78af5997cc6dec729903f58a278a5753453991c2..b1e4d4e9d20310cf686b5e92215efa74b025dc4b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,8 +13,8 @@ test-glib-gio-fs: - .update-test-binaries variables: GIT_PUSH_URL: "" - REPOSITORY: glib-gio-fs + TESTCASE: glib-gio-fs before_script: - - git clone "${CI_SERVER_URL}/tests/$REPOSITORY.git/" "$REPOSITORY" - - cd "$REPOSITORY" + - git clone "${CI_SERVER_URL}/tests/$TESTCASE.git/" "$TESTCASE" + - cd "$TESTCASE" - git checkout f86085845450 diff --git a/gitlab-ci/update-test-binaries.yaml b/gitlab-ci/update-test-binaries.yaml index e1b2a12cb18d890d0376da39012bba2a65f26b22..b399c4fd1338e9c61c44c5becc32a5e4ae431e76 100644 --- a/gitlab-ci/update-test-binaries.yaml +++ b/gitlab-ci/update-test-binaries.yaml @@ -5,12 +5,9 @@ variables: BRANCH: $CI_COMMIT_BRANCH GIT_PUSH_URL: https://${GITLAB_CI_USER}:${GITLAB_CI_PASSWORD}@${CI_SERVER_HOST}/${CI_PROJECT_PATH}.git/ - REPOSITORY: $CI_PROJECT_NAME script: - env --null | sort -z | tr '\0' '\n' - - cd .. - - test -d $REPOSITORY - wget ${CI_SERVER_URL}/tests/helper-tools/-/raw/${osname}/${release}/update_test_binaries.sh -O /tmp/update_test_binaries.sh - - bash /tmp/update_test_binaries.sh --release "${release}" --branch "$BRANCH" --repository "$REPOSITORY" --dry-run - - git -C "$REPOSITORY" show - - if [ -n "$GIT_PUSH_URL" ]; then git -C "$REPOSITORY" push "${GIT_PUSH_URL}" "HEAD:${BRANCH}"; fi + - bash /tmp/update_test_binaries.sh --release "${release}" --branch "$BRANCH" --repository . --dry-run + - git show + - if [ -n "$GIT_PUSH_URL" ]; then git push "${GIT_PUSH_URL}" "HEAD:${BRANCH}"; fi