Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
target
/config.toml
.gitlab-ci-local/
target
/config.toml
.gitlab-ci-local/
60 changes: 30 additions & 30 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
@@ -1,30 +1,30 @@
image: "redoxos/redoxer:latest"

variables:
GIT_SUBMODULE_STRATEGY: recursive

stages:
- host
- build
- test
# TODO: benchmarks and profiling (maybe manually enabled for relevant MRs)?

build:
stage: build
script:
- mkdir -p target/${ARCH}
- TARGET=${ARCH}-unknown-redox redoxer env make BUILD=target/${ARCH}
parallel:
matrix:
- ARCH: [x86_64, i686, aarch64, riscv64gc]

fmt:
stage: host
script:
- rustup component add rustfmt-preview
- cargo fmt -- --check

unit_test:
stage: test
script:
- TARGET=x86_64-unknown-redox redoxer test
image: "redoxos/redoxer:latest"
variables:
GIT_SUBMODULE_STRATEGY: recursive
stages:
- host
- build
- test
# TODO: benchmarks and profiling (maybe manually enabled for relevant MRs)?
build:
stage: build
script:
- mkdir -p target/${ARCH}
- TARGET=${ARCH}-unknown-redox redoxer env make BUILD=target/${ARCH}
parallel:
matrix:
- ARCH: [x86_64, i686, aarch64, riscv64gc]
fmt:
stage: host
script:
- rustup component add rustfmt-preview
- cargo fmt -- --check
unit_test:
stage: test
script:
- TARGET=x86_64-unknown-redox redoxer test
22 changes: 11 additions & 11 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
[submodule "slab_allocator"]
path = slab_allocator
url = https://gitlab.redox-os.org/redox-os/slab_allocator
[submodule "rmm"]
path = rmm
url = https://gitlab.redox-os.org/redox-os/rmm.git
branch = master
[submodule "redox-path"]
path = redox-path
url = https://gitlab.redox-os.org/redox-os/redox-path.git
branch = main
[submodule "slab_allocator"]
path = slab_allocator
url = https://gitlab.redox-os.org/redox-os/slab_allocator
[submodule "rmm"]
path = rmm
url = https://gitlab.redox-os.org/redox-os/rmm.git
branch = master
[submodule "redox-path"]
path = redox-path
url = https://gitlab.redox-os.org/redox-os/redox-path.git
branch = main
4 changes: 2 additions & 2 deletions .helix/config.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[editor]
auto-format = false
[editor]
auto-format = false
26 changes: 13 additions & 13 deletions .helix/languages.toml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
[[language]]
name = "rust"

[[language-server.rust-analyzer.config.cargo]]
extraEnv = ["RUST_TARGET_PATH=targets"]
# Select one of targets to make lsp work for your confguration
# Do not commit this change
# TODO: find a better way to do this
# target = "aarch64-unknown-kernel"

[[language-server.rust-analyzer.config.check]]
targets = ["x86_64-unknown-kernel", "i686-unknown-kernel", "aarch64-unknown-kernel"]

[[language]]
name = "rust"
[[language-server.rust-analyzer.config.cargo]]
extraEnv = ["RUST_TARGET_PATH=targets"]
# Select one of targets to make lsp work for your confguration
# Do not commit this change
# TODO: find a better way to do this
# target = "aarch64-unknown-kernel"
[[language-server.rust-analyzer.config.check]]
targets = ["x86_64-unknown-kernel", "i686-unknown-kernel", "aarch64-unknown-kernel"]
158 changes: 79 additions & 79 deletions ARM-AARCH64-PORT-OUTLINE.md

Large diffs are not rendered by default.

Loading