Compare commits

..

9 Commits

Author SHA1 Message Date
Jeremy Soller b750fc9185
Update kernel 2020-08-02 17:08:14 -06:00
Jeremy Soller dccf2fe2f3
Update submodules 2020-08-02 16:34:07 -06:00
Jeremy Soller 0441eb545c
Update relibc 2020-08-02 14:47:21 -06:00
Jeremy Soller 3faac0ef98
Update relibc 2020-08-02 13:42:43 -06:00
Jeremy Soller d892af868b
Update relibc 2020-08-02 13:38:38 -06:00
Jeremy Soller 570bbb72e3 Merge branch 'fix-ci-missing-xargo' into 'master'
Update .gitlab-ci.yml

See merge request redox-os/redox!1248
2020-08-02 19:14:32 +00:00
Jeremy Soller a8b31ad8fc
Use 2020-07-27 nightly, it has rustfmt 2020-08-02 13:07:18 -06:00
Jeremy Soller 995165c07f
Update to nightly 2020-08-01 2020-08-02 12:43:47 -06:00
colepoirier 31c425288c Update .gitlab-ci.yml 2020-07-31 16:38:44 +00:00
9 changed files with 10 additions and 10 deletions

View File

@ -33,8 +33,8 @@ img:
- | - |
source "$HOME/.cargo/env" && source "$HOME/.cargo/env" &&
cargo install --version 0.1.1 cargo-config && cargo install --version 0.1.1 cargo-config &&
cargo install --version 0.3.20 cargo-xbuild && cargo install cargo-xbuild &&
cargo install xargo && cargo install --version 0.3.20 xargo &&
make ci-img IMG_TAG=$CI_COMMIT_REF_NAME make ci-img IMG_TAG=$CI_COMMIT_REF_NAME
artifacts: artifacts:
paths: paths:

2
.gitmodules vendored
View File

@ -25,7 +25,7 @@
[submodule "rust"] [submodule "rust"]
path = rust path = rust
url = https://gitlab.redox-os.org/redox-os/rust.git url = https://gitlab.redox-os.org/redox-os/rust.git
branch = redox-2019-11-25 branch = redox-2020-07-27
[submodule "redoxfs"] [submodule "redoxfs"]
path = redoxfs path = redoxfs
url = https://gitlab.redox-os.org/redox-os/redoxfs.git url = https://gitlab.redox-os.org/redox-os/redoxfs.git

@ -1 +1 @@
Subproject commit 7246f3e155cade45433bcfcf91058a8ad7125924 Subproject commit 10d3e23902e3bc1cb4cf27c1d16e6ed60e0d1a87

@ -1 +1 @@
Subproject commit af5f64b8071462e7325c55981f026df5870fc51b Subproject commit 150d65c31ba05c829ba239a3febe1e44b6e512e8

2
kernel

@ -1 +1 @@
Subproject commit 615e516585c248a874afa8c68f465b11eec6e5e0 Subproject commit 1a8f47330ec6fa8397ccf6ee04fc86a82d36a82f

@ -1 +1 @@
Subproject commit 0068a6d4980e83e36c2f08fd64e4809da5ce136c Subproject commit f1b88c38c0a9b6bf9e24f82397a8a9505c9a2df2

2
relibc

@ -1 +1 @@
Subproject commit cbd7ead0ff9747f344942c808376354814f6dacf Subproject commit 2008296a1030b60aaf853303dc337f7f13ded179

2
rust

@ -1 +1 @@
Subproject commit 1b5587860b4ca27811720a6f411a3d20a887844a Subproject commit 6ab9e2656b8aa3d43c4977cc09a098dec7bcdafd

View File

@ -1 +1 @@
nightly-2019-11-25 nightly-2020-07-27