From 651002704d7a312586608c0ff4967964ffa6db72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Tj=C3=A4der?= <henrik@tjaders.com>
Date: Mon, 22 Jan 2018 22:03:18 +0000
Subject: [PATCH] Update .gitlab-ci.yml
---
.gitlab-ci.yml | 23 ++++++++++++-----------
1 file changed, 12 insertions(+), 11 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 23966f47..0c8e50d8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,18 +7,18 @@ before_script:
- apt-get update -yqq
- apt-get install -yqq --no-install-recommends build-essential gcc-arm-none-eabi gcc-multilib binutils-arm-none-eabi binutils-arm-none-eabi gdb-arm-none-eabi
# Must be outside the project folder
- - cd /
- - cargo install xargo
+ # - cd /
+ # - cargo install xargo
# Return
- - cd -
+ # - cd -
#- rustup toolchain remove nightly
- #- rustup toolchain install nightly
+ # - rustup toolchain install nightly
- rustup default nightly
- - rustup target add arm-unknown-linux-gnueabihf
- - rustup target add arm-unknown-linux-gnueabi
- - rustup target add armv7-unknown-linux-gnueabihf
- - rustup component add rust-src
- - rustup update
+ # - rustup target add arm-unknown-linux-gnueabihf
+ # - rustup target add arm-unknown-linux-gnueabi
+ # - rustup target add armv7-unknown-linux-gnueabihf
+ # - rustup component add rust-src
+ # - rustup update
# Generate documentation
@@ -28,11 +28,12 @@ pages:
only:
- master
script:
- - xargo doc --no-deps
+ - cargo doc --no-deps
- rm -rf public
- mkdir public
# The content inside the target doc folder, but index even deeper down
- - cp -R target/thumbv7em-none-eabihf/doc/* public
+ - ls target
+ - cp -R target/doc/* public
artifacts:
paths:
- public
--
GitLab