Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Changed to oct toolchain

Browse Source
This commit is contained in:
Forest 2019-10-03 16:53:21 -04:00
parent 5bcec6391a
commit 4a59ed233c
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.gitlab-ci.yml
View File

@ -8,6 +8,7 @@ stages:
variables: variables:
GIT_STRATEGY: none GIT_STRATEGY: none
before_script: before_script:
# Make the directories
- mkdir -p /cache/veloren - mkdir -p /cache/veloren
- rm -rf /cache/veloren/bin - rm -rf /cache/veloren/bin
- cd /cache/veloren - cd /cache/veloren
@ -17,10 +18,12 @@ before_script:
git clone $CI_REPOSITORY_URL . ; git clone $CI_REPOSITORY_URL . ;
fi; fi;
- mkdir -p /cache/veloren/bin - mkdir -p /cache/veloren/bin
# Remove previous Git files
- rm -f .git/index.lock - rm -f .git/index.lock
- rm -f .git/shallow.lock - rm -f .git/shallow.lock
- rm -f .git/HEAD.lock - rm -f .git/HEAD.lock
- rm -f .git/hocks/post-checkout - rm -f .git/hocks/post-checkout
# Do an efficient Git checkout
- git remote set-url origin $CI_REPOSITORY_URL - git remote set-url origin $CI_REPOSITORY_URL
- git fetch origin --prune +refs/heads/*:refs/remotes/origin/* +refs/tags/*:refs/tags/* - git fetch origin --prune +refs/heads/*:refs/remotes/origin/* +refs/tags/*:refs/tags/*
- git checkout -f -q $CI_COMMIT_SHA - git checkout -f -q $CI_COMMIT_SHA
@ -28,14 +31,19 @@ before_script:
echo "THIS SEEMS TO BE A MERGE PIPELINE FROM ${SOURCE_PROJECT}/${SOURCE_BRANCH}"; echo "THIS SEEMS TO BE A MERGE PIPELINE FROM ${SOURCE_PROJECT}/${SOURCE_BRANCH}";
git pull "https://gitlab.com/${SOURCE_PROJECT}/veloren.git" "${SOURCE_BRANCH}"; git pull "https://gitlab.com/${SOURCE_PROJECT}/veloren.git" "${SOURCE_BRANCH}";
fi; fi;
# Prepare Git LFS
- git lfs install; - git lfs install;
- git lfs fetch; - git lfs fetch;
- git lfs checkout; - git lfs checkout;
# Debug info
- git status - git status
- rustup -v show - rustup -v show
# See what's in the target folder?
- if [ -d target ]; then - if [ -d target ]; then
ls -la target; ls -la target;
fi; fi;
# Overwrite toolchain
- cp /rust-toolchain /cache/veloren/rust-toolchain
############# #############
# Optional build # Optional build

2
rust-toolchain
View File

@ -1 +1 @@
nightly-2019-09-03 nightly-2019-10-03