Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix CI #28

Merged
merged 4 commits into from
May 29, 2024
Merged
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
9 changes: 5 additions & 4 deletions .github/workflows/x86_64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ on:
jobs:
build:
runs-on: ubuntu-latest
container: ghcr.io/hermitcore/hermit-toolchain:latest
container: ghcr.io/hermit-os/hermit-toolchain:latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: true
- name: Build apps
Expand All @@ -19,9 +19,10 @@ jobs:
cmake ..
make
- name: Download loader
uses: dsaltares/fetch-gh-release-asset@1.1.0
uses: dsaltares/fetch-gh-release-asset@master
with:
repo: hermitcore/rusty-loader
repo: hermit-os/loader
version: tags/v0.4.3
file: rusty-loader-x86_64
- name: Install QEMU
run: |
Expand Down
4 changes: 2 additions & 2 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[submodule "librs"]
path = librs
url = https://github.com/hermitcore/libhermit-rs.git
url = https://github.com/hermit-os/kernel.git
[submodule "lwip"]
path = lwip
url = https://github.com/hermitcore/LwIP.git
url = https://github.com/hermit-os/LwIP.git
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
FROM rust:buster as builder

RUN cargo install --git https://github.com/hermitcore/uhyve.git --locked uhyve
RUN cargo install --git https://github.com/hermit-os/uhyve.git --locked uhyve


FROM ghcr.io/hermitcore/hermit-toolchain:latest as playground
FROM ghcr.io/hermit-os/hermit-toolchain:latest as playground

COPY --from=builder $CARGO_HOME/bin/uhyve $CARGO_HOME/bin/uhyve
16 changes: 8 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,19 @@

# HermitCore-rs - A Rust-based, lightweight unikernel for a scalable and predictable runtime behavior

[![Build Status](https://git.rwth-aachen.de/acs/public/hermitcore/hermit-playground/badges/master/pipeline.svg)](https://git.rwth-aachen.de/acs/public/hermitcore/hermit-playground/pipelines)
[![Build Status](https://git.rwth-aachen.de/acs/public/hermit-os/hermit-playground/badges/master/pipeline.svg)](https://git.rwth-aachen.de/acs/public/hermit-os/hermit-playground/pipelines)
[![Slack Status](https://matrix.osbyexample.com:3008/badge.svg)](https://matrix.osbyexample.com:3008)

[HermitCore]( http://www.hermitcore.org ) is a new
[HermitCore]( http://www.hermit-os.org ) is a new
[unikernel](http://unikernel.org) targeting a scalable and predictable runtime
for high-performance and cloud computing.
We decided to develop a new version of the kernel in [Rust](https://www.rust-lang.org) .
We promise that this will make it easier to maintain and extend our kernel.
All code beside the kernel can still be developed in your preferred language (C/C++/Go/Fortran).
If you want to develope pure Rust applications, please look into [RustyHermit](https://github.com/hermitcore/libhermit-rs).
If you want to develope pure Rust applications, please look into [RustyHermit](https://github.com/hermit-os/libhermit-rs).

This repository contains the Rust-based playground for C/C++/Go/Fortran applications.
Currently, it isn't stable and does not support all features of the [C-based version](https://github.com/hermitcore/libhermit) and runs only in our own hypervisor.
Currently, it isn't stable and does not support all features of the [C-based version](https://github.com/hermit-os/libhermit) and runs only in our own hypervisor.

## Requirements

Expand All @@ -36,14 +36,14 @@ To test the toolchain, create a simple C program (e.g. `hello world`) and name t
Use following command to build the applications:

```bash
$ docker run -v $PWD:/volume -w /volume --rm -t ghcr.io/hermitcore/hermit-toolchain:latest x86_64-hermit-gcc -o main main.c
$ docker run -v $PWD:/volume -w /volume --rm -t ghcr.io/hermit-os/hermit-toolchain:latest x86_64-hermit-gcc -o main main.c
```

The command mounts the current directory as working directory into a docker container and runs the cross-compiler to build the application.
Afterwards, you will find the executable `main` in your current directory.

If you want to build the toolchain yourself, have a look at the `path2rs` branch of the repository
[hermit-toolchain](https://github.com/hermitcore/hermit-toolchain).
[hermit-toolchain](https://github.com/hermit-os/hermit-toolchain).
It contains scripts to build the whole toolchain for HermitCore-rs.

## Building
Expand All @@ -53,7 +53,7 @@ It contains scripts to build the whole toolchain for HermitCore-rs.
As a first step, the repository and its submodules have to be cloned:

```bash
$ git clone --recursive https://github.com/hermitcore/hermit-playground.git
$ git clone --recursive https://github.com/hermit-os/hermit-playground.git
$ cd hermit-playground
```

Expand Down Expand Up @@ -202,5 +202,5 @@ at your option.

Unless you explicitly state otherwise, any contribution intentionally submitted for inclusion in the work by you, as defined in the Apache-2.0 license, shall be dual licensed as above, without any additional terms or conditions.

HermitCore-rs is being developed on [GitHub](https://github.com/hermitcore/hermit-playground ).
HermitCore-rs is being developed on [GitHub](https://github.com/hermit-os/hermit-playground ).
Create your own fork, send us a pull request, and chat with us on [Slack](https://radiant-ridge-95061.herokuapp.com)