From f106386c9020126d4f8d6aab41abebb1569cdfee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Kr=C3=B6ning?= Date: Wed, 29 May 2024 10:13:37 +0200 Subject: [PATCH 1/4] ci: update checkout action to v4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Martin Kröning --- .github/workflows/x86_64.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/x86_64.yml b/.github/workflows/x86_64.yml index 97ae3751..81a1f9f4 100644 --- a/.github/workflows/x86_64.yml +++ b/.github/workflows/x86_64.yml @@ -9,7 +9,7 @@ jobs: runs-on: ubuntu-latest container: ghcr.io/hermitcore/hermit-toolchain:latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: submodules: true - name: Build apps From 845ebfb90a178dac68c547d9b26ca76f26ea94c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Kr=C3=B6ning?= Date: Wed, 29 May 2024 10:07:35 +0200 Subject: [PATCH 2/4] fix: rename hermitcore org to hermit-os MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Martin Kröning --- .github/workflows/x86_64.yml | 4 ++-- .gitmodules | 4 ++-- Dockerfile | 4 ++-- README.md | 16 ++++++++-------- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/x86_64.yml b/.github/workflows/x86_64.yml index 81a1f9f4..b3eed82b 100644 --- a/.github/workflows/x86_64.yml +++ b/.github/workflows/x86_64.yml @@ -7,7 +7,7 @@ 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@v4 with: @@ -21,7 +21,7 @@ jobs: - name: Download loader uses: dsaltares/fetch-gh-release-asset@1.1.0 with: - repo: hermitcore/rusty-loader + repo: hermit-os/loader file: rusty-loader-x86_64 - name: Install QEMU run: | diff --git a/.gitmodules b/.gitmodules index 772ee7b4..126641d0 100644 --- a/.gitmodules +++ b/.gitmodules @@ -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 diff --git a/Dockerfile b/Dockerfile index daf6ac4e..aba2bebe 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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 diff --git a/README.md b/README.md index 923954f4..96bc60e5 100644 --- a/README.md +++ b/README.md @@ -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 @@ -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 @@ -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 ``` @@ -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) From dafcad31403b56510ceb3c7e85e19812ea9d1203 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Kr=C3=B6ning?= Date: Wed, 29 May 2024 10:25:06 +0200 Subject: [PATCH 3/4] ci: update dsaltares/fetch-gh-release-asset to master --- .github/workflows/x86_64.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/x86_64.yml b/.github/workflows/x86_64.yml index b3eed82b..2d1b88f9 100644 --- a/.github/workflows/x86_64.yml +++ b/.github/workflows/x86_64.yml @@ -19,7 +19,7 @@ jobs: cmake .. make - name: Download loader - uses: dsaltares/fetch-gh-release-asset@1.1.0 + uses: dsaltares/fetch-gh-release-asset@master with: repo: hermit-os/loader file: rusty-loader-x86_64 From 183b24632b6c91c29716ae591b54557c5ca5ef4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Kr=C3=B6ning?= Date: Wed, 29 May 2024 10:18:45 +0200 Subject: [PATCH 4/4] ci: pin loader version MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Martin Kröning --- .github/workflows/x86_64.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/x86_64.yml b/.github/workflows/x86_64.yml index 2d1b88f9..c8709c32 100644 --- a/.github/workflows/x86_64.yml +++ b/.github/workflows/x86_64.yml @@ -22,6 +22,7 @@ jobs: uses: dsaltares/fetch-gh-release-asset@master with: repo: hermit-os/loader + version: tags/v0.4.3 file: rusty-loader-x86_64 - name: Install QEMU run: |