diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-03-17 02:27:42 +0300 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2017-03-17 06:28:18 +0300 |
| commit | 4e1156a099255d2f520ea55393111932c14462bf (patch) | |
| tree | a9760f950079abd5bc0b22a42e2ebd33aa77a8a2 /.gitlab-ci.yml | |
| parent | 2da8b5dc6f62dd72a74673172c30715b2e6af478 (diff) | |
Merge branch 'zj-fix-slack-link' into 'master'
Fix Slack link when on notify
See merge request !9999
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e1674e21df4..7b4989ffaf7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -209,7 +209,7 @@ rake ee_compat_check: - ee_compat_check/repo/ - vendor/ruby artifacts: - name: "${CI_JOB_NAME}_${CI_COMIT_REF_NAME}_${CI_COMMIT_REF}" + name: "${CI_JOB_NAME}_${CI_COMIT_REF_NAME}_${CI_COMMIT_SHA}" when: on_failure expire_in: 10d paths: @@ -320,7 +320,7 @@ migration paths: - sed -i 's/localhost/redis/g' config/resque.yml - bundle install --without postgres production --jobs $(nproc) $FLAGS --retry=3 - bundle exec rake db:drop db:create db:schema:load db:seed_fu - - git checkout $CI_COMMIT_REF + - git checkout $CI_COMMIT_SHA - source scripts/prepare_build.sh - bundle exec rake db:migrate @@ -384,7 +384,6 @@ trigger_docs: - master@gitlab-org/gitlab-ce # Notify slack in the end - notify:slack: stage: post-test <<: *dedicated-runner @@ -392,7 +391,7 @@ notify:slack: SETUP_DB: "false" USE_BUNDLE_INSTALL: "false" script: - - ./scripts/notify_slack.sh "#development" "Build on \`$CI_COMMIT_REF_NAME\` failed! Commit \`$(git log -1 --oneline)\` See <https://gitlab.com/gitlab-org/$(basename "$PWD")/commit/"$CI_COMMIT_REF"/pipelines>" + - ./scripts/notify_slack.sh "#development" "Build on \`$CI_COMMIT_REF_NAME\` failed! Commit \`$(git log -1 --oneline)\` See <https://gitlab.com/gitlab-org/$(basename "$PWD")/commit/"$CI_COMMIT_SHA"/pipelines>" when: on_failure only: - master@gitlab-org/gitlab-ce |