diff options
| author | Jeremy Soller <jackpot51@gmail.com> | 2018-06-10 10:04:10 -0600 |
|---|---|---|
| committer | Jeremy Soller <jackpot51@gmail.com> | 2018-06-10 10:04:10 -0600 |
| commit | 24ac5c8507c2a5ee30db60db1a14e0e10ed9282d (patch) | |
| tree | 76e53bb00cd9dbf00fe8c2ce1ac5919df4a15d4d | |
| parent | e7375348e093c47026b6b3478d0bac7364865ede (diff) | |
Adjust gitlab ci
| -rw-r--r-- | .gitlab-ci.yml | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6bf58a3..e3771f1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -23,20 +23,12 @@ before_script: apt-get update -qq && apt-get purge -qq binutils-doc && apt-get install -qq x86-64-unknown-redox-gcc && - curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain none && - [ -d "$CI_PROJECT_NAME" ] || git clone "$CI_REPOSITORY_URL" "$CI_PROJECT_NAME" && - cd "$CI_PROJECT_NAME" && - git remote set-url origin "$CI_REPOSITORY_URL" && - git fetch origin && - git checkout "$CI_COMMIT_SHA" && - git submodule update --init --recursive && - source "$HOME/.cargo/env" && - rustup update && - cargo install cargo-config xargo + curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain none img: script: - | - cd "$CI_PROJECT_NAME" && source "$HOME/.cargo/env" && + rustup update && + cargo install cargo-config xargo && make ci-img IMG_TAG=$CI_COMMIT_REF_NAME |