summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamwiseFilmore <mggmugginsmc@gmail.com>2018-07-01 22:35:13 +0000
committerSamwiseFilmore <mggmugginsmc@gmail.com>2018-07-01 22:35:13 +0000
commit6d1a4c9c39cee06fe743027827dddbc647250cd3 (patch)
treed75a682739cdd6ff1d13b4cef7df4db7bea87d04
parent3ee8b319eef7cc2d4cc2861af8a093cbdeafc9f1 (diff)
Use image for CI
-rw-r--r--.gitlab-ci.yml38
1 files changed, 8 insertions, 30 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 696f29f..3fc0ab4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,43 +1,21 @@
+image: "redoxos/redox"
+
variables:
GIT_STRATEGY: "pull"
GIT_SUBMODULE_STRATEGY: "recursive"
GIT_CHECKOUT: "true"
before_script:
- - |
- apt-get update -qq &&
- apt-get install -qq \
- build-essential \
- curl \
- dosfstools \
- fuse \
- genisoimage \
- git \
- gnupg \
- libfuse-dev \
- nasm \
- pkg-config \
- software-properties-common \
- syslinux \
- syslinux-utils \
- wget &&
- apt-key adv -q --batch --yes --keyserver keyserver.ubuntu.com --recv-keys AA12E97F0881517F &&
- add-apt-repository 'deb https://static.redox-os.org/toolchain/apt ./' &&
- 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
+ - rustup update
+ - rustup componenet add rust-src
+ - cargo install cargo-config xargo
+ - pushd bootloader-efi
+ - rustup update
+ - rustup component add rust-src
img:
script:
- |
- source "$HOME/.cargo/env" &&
- rustup update &&
- rustup component add rust-src &&
- cargo install cargo-config xargo &&
- pushd bootloader-efi &&
- rustup update &&
- rustup component add rust-src &&
mkdir -p "$HOME/.rustup/toolchains/nightly-2017-11-29-x86_64-unknown-linux-gnu/lib/rustlib/x86_64-unknown-linux-gnu/bin" &&
popd &&
make ci-img IMG_TAG=$CI_COMMIT_REF_NAME