Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
redox
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Pirson Bethancourt
redox
Commits
58217e34
Verified
Commit
58217e34
authored
6 years ago
by
Jeremy Soller
Browse files
Options
Downloads
Patches
Plain Diff
Update gitlab CI
parent
8160d711
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.gitlab-ci.yml
+1
-2
1 addition, 2 deletions
.gitlab-ci.yml
.travis.yml
+0
-51
0 additions, 51 deletions
.travis.yml
with
1 addition
and
53 deletions
.gitlab-ci.yml
+
1
−
2
View file @
58217e34
...
...
@@ -32,11 +32,10 @@ img:
source "$HOME/.cargo/env" &&
rustup update &&
rustup component add rust-src &&
cargo install cargo-config xargo &&
cargo install cargo-config
cargo-xbuild
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
artifacts
:
...
...
This diff is collapsed.
Click to expand it.
.travis.yml
deleted
100644 → 0
+
0
−
51
View file @
8160d711
sudo
:
required
dist
:
trusty
language
:
rust
cache
:
cargo
rust
:
-
nightly
# OSX has been disabled for the moment
matrix
:
#allow_failures:
# - os: osx
include
:
-
os
:
linux
before_install
:
-
|
sudo apt-key adv -q --batch --yes --keyserver keyserver.ubuntu.com --recv-keys AA12E97F0881517F &&
sudo add-apt-repository 'deb https://static.redox-os.org/toolchain/apt ./' &&
sudo apt-get update -qq &&
sudo apt-get purge -qq binutils-doc &&
sudo apt-get install -qq nasm pkg-config fuse libfuse-dev genisoimage syslinux realpath x86-64-unknown-redox-gcc &&
sudo modprobe fuse &&
sudo chmod 666 /dev/fuse &&
sudo chown root:$USER /etc/fuse.conf
# - os: osx
# before_install:
# - |
# brew update &&
# brew install nasm pkg-config Caskroom/cask/osxfuse &&
# travis_wait 30 brew install redox-os/gcc_cross_compilers/x86_64-elf-gcc
# before_script runs after before_install
before_script
:
-
cd cookbook && ./setup.sh && cd ..
script
:
-
make clean && make travis IMG_TAG=$TRAVIS_TAG
deploy
:
provider
:
releases
api_key
:
secure
:
E5w3mgFbW4fAFNJn0FGcvwGKK33d+StC4izDX7dsGPxX/gwAsMnZqabDWpsrj8n/jFI5NdPzuyz4Ojkip4AXrEs0DWfX96d9CSWvJmWIirwwKhALnxZ5cqnHnBXY3wpk9k8MKpdODzKs3ZjM3pPug2jjjp2EHdrEV6iyc8LlnLAJutbtPpNJv0rJrx/TfCZRx70YWKQyx2Lfx5P6Vj+5yoYsKk+SHmKZlIQfj2E1cfC8+/w+fzc9CRTNhM9XFBisKnu9qql3nNhEW8VUNQ9FnltGpunmcTnCmsKzHPfs8Zv6kM/6y3wuoqxwPnIwRu+zsntkjM/eT7Zy3DtTBqJDjq+L5jov50QWOxzjUuFYMv0lAMeMC0PIGn0ECpFs546M+Wqvd7HKgabac0UhilEBPbinOdW+6aOOhbo+Fe2I2ec0XIGxlQpccQeWQUsjjOQ+6QuvnpPE+CbvQaVyrx27rVAkqD44cOP8xqOq2Es651J+Dt0O1OIhLdPB3FxOLCDpEIHU5Ojci1QbUxZgGKjShpo44nNqcTv7v71JrfzFSVG2pF9a35Mpo6bFEkzyQprOyrwH2fcnN+4jyxdJXzdNsgraXsQopWAB5cL/8i7SXMwHy9ivpFaX/zgoHQqpc1a4VjrmTtPA08rLORIllw9CplfvJNsmNmCi2aSeTXR06Xk=
file_glob
:
true
file
:
build/travis/*
on
:
repo
:
redox-os/redox
tags
:
true
condition
:
$TRAVIS_OS_NAME = linux
skip_cleanup
:
true
notifications
:
email
:
false
webhooks
:
http://37.139.9.28:54863/travis
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment