Skip to content
This repository has been archived by the owner on Nov 6, 2020. It is now read-only.

Commit

Permalink
Merge remote-tracking branch 'origin/master' into dp/chore/update-com…
Browse files Browse the repository at this point in the history
…mon-deps

* origin/master:
  Schedule nightly builds (#9717)
  Fix ancient blocks sync (#9531)
  CI: Skip docs job for nightly (#9693)
  • Loading branch information
dvdplm committed Oct 9, 2018
2 parents 1dae486 + 5a8fb77 commit 7d12a51
Show file tree
Hide file tree
Showing 9 changed files with 263 additions and 115 deletions.
16 changes: 11 additions & 5 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,17 @@ cache:

.releaseable_branches: # list of git refs for building GitLab artifacts (think "pre-release binaries")
only: &releaseable_branches
- stable
- beta
- tags
refs:
- stable
- beta
- tags
variables:
- $SCHEDULE_TAG == "nightly"


.collect_artifacts: &collect_artifacts
artifacts:
name: "${CI_JOB_NAME}_${CI_COMMIT_REF_NAME}"
name: "${CI_JOB_NAME}_${SCHEDULE_TAG:-${CI_COMMIT_REF_NAME}}"
when: on_success
expire_in: 1 mos
paths:
Expand All @@ -37,7 +41,7 @@ cache:
- VERSION="$(sed -r -n '1,/^version/s/^version = "([^"]+)".*$/\1/p' Cargo.toml)"
- DATE_STR="$(date +%Y%m%d)"
- ID_SHORT="$(echo ${CI_COMMIT_SHA} | cut -c 1-7)"
- test "${CI_COMMIT_REF_NAME}" = "nightly" && VERSION="${VERSION}-${ID_SHORT}-${DATE_STR}"
- test "${SCHEDULE_TAG:-${CI_COMMIT_REF_NAME}}" = "nightly" && VERSION="${VERSION}-${ID_SHORT}-${DATE_STR}"
- export VERSION
- echo "Version = ${VERSION}"

Expand Down Expand Up @@ -114,6 +118,8 @@ docs-jsonrpc:
stage: optional
only:
- tags
except:
- nightly
cache: {}
script:
- scripts/gitlab/docs-jsonrpc.sh
Expand Down
Loading

0 comments on commit 7d12a51

Please sign in to comment.