From f7931ce4986da2359fefb1ab46fd0fc7b6703000 Mon Sep 17 00:00:00 2001
From: Ruoqing He <heruoqing@iscas.ac.cn>
Date: Tue, 16 Jul 2024 13:56:33 +0800
Subject: [PATCH] Introduce `riscv64` architecture

Based on architecture support provided by ubuntu 24.10, introduce
`riscv64` image to enable `build-gnu-riscv64` and
`unittests-gnu-riscv64` tests on `riscv64` platforms for now.

Signed-off-by: Ruoqing He <heruoqing@iscas.ac.cn>
---
 .github/workflows/docker-publish.yml | 2 +-
 README.md                            | 4 ++--
 docker.sh                            | 3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 3c4089f..eb3fdf0 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -62,7 +62,7 @@ jobs:
           push: ${{ github.event_name != 'pull_request' }}
           # This is needed so that a manifest is created, and we can have the same
           # docker container on both x86_64 and arm64.
-          platforms: linux/amd64,linux/arm64
+          platforms: linux/amd64,linux/arm64,linux/riscv64
           tags: ${{ env.VERSION }}
           labels: ${{ steps.meta.outputs.labels }}
           cache-from: type=gha
diff --git a/README.md b/README.md
index a5311d2..8187378 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 **`rustvmm/dev`** is a container with all dependencies used for running
 `rust-vmm` integration and performance tests. The container is available on
-Docker Hub and has support for `x86_64` and `aarch64` platforms.
+Docker Hub and has support for `x86_64`, `aarch64` and `riscv64` platforms.
 
 For the latest available tag, please check the `rustvmm/dev` builds available
 on [Docker Hub](https://hub.docker.com/r/rustvmm/dev/tags).
@@ -67,7 +67,7 @@ On an `aarch64` platform:
 ```
 
 You will need to redo all steps on an `x86_64` platform so the containers are
-kept in sync (same package versions on both `x86_64` and `aarch64`).
+kept in sync (same package versions on `x86_64`, `aarch64` and `riscv64`).
 
 Now that the tags `v4_x86_64` and `v4_aarch64` are pushed to Docker Hub, we can
 go ahead and also create a new version tag that points to these two builds
diff --git a/docker.sh b/docker.sh
index 3f3fa0a..dfa6de9 100755
--- a/docker.sh
+++ b/docker.sh
@@ -52,7 +52,8 @@ manifest(){
   docker manifest create \
         $new_tag \
         "${new_tag}_x86_64" \
-        "${new_tag}_aarch64"
+        "${new_tag}_aarch64" \
+        "${new_tag}_riscv64"
   echo "Manifest successfully created"
   docker manifest push $new_tag
   echo "Manifest successfully pushed on DockerHub: ${DOCKERHUB_LINK}"