Compare commits

..

No commits in common. "b750fc9185206ce7747b53f6a9ea12102662b56d" and "48e076a6318fc5036445870df076155f2f4f6414" have entirely different histories.

9 changed files with 10 additions and 10 deletions

View File

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

2
.gitmodules vendored
View File

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

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

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

2
kernel

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

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

2
relibc

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

2
rust

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

View File

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