diff --git a/Dockerfile b/Dockerfile index ee3f295..350c576 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,6 +9,9 @@ RUN apt update && apt install -y \ pkg-config \ libudev-dev \ procps \ + gcc-riscv64-unknown-elf \ + gcc-riscv64-linux-gnu \ + binutils-riscv64-linux-gnu \ && rm -rf /var/lib/apt/lists/* RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y diff --git a/Jenkinsfile b/Jenkinsfile index c11e198..8ec20b6 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,7 +1,7 @@ pipeline { agent any stages { - stage('Tests and compiling binaries1') { + stage('Tests and compiling binaries') { when { expression { env.CHANGE_BRANCH?.startsWith('feature/') } } @@ -9,14 +9,14 @@ pipeline { script { echo "Building and running tests in Docker for feature branch..." try { - def targetDirAmd = "${env.WORKSPACE}/${env.CHANGE_BRANCH}/x86" - def targetDirRisc = "${env.WORKSPACE}/${env.CHANGE_BRANCH}/riscv" + def targetDirAmd = "${env.WORKSPACE}/${env.CHANGE_BRANCH}/x86/" + def targetDirRisc = "${env.WORKSPACE}/${env.CHANGE_BRANCH}/riscv/" - sh "mkdir -p ${targetDir}" + sh "mkdir -p ${targetDirAmd}" + sh "mkdir -p ${targetDirRisc}" sh """ docker build --network=host -t e-monitor . - docker run --name e-monitor --dns 8.8.8.8 --network=host e-monitor:latest """ @@ -69,7 +69,7 @@ pipeline { } steps { script { - echo "Attempting to merge PR ${env.CHANGE_ID} using credentials..." + echo "Attempting to merge PR ${env.CHANGE_ID} using credentials ..." withCredentials([usernamePassword(credentialsId: 'Jenkins creds', usernameVariable: 'GITEA_USER', passwordVariable: 'GITEA_PASS')]) { def prId = env.CHANGE_ID sh """ diff --git a/noxis-rs/src/options/preboot.rs b/noxis-rs/src/options/preboot.rs index 8130e96..84a3f27 100644 --- a/noxis-rs/src/options/preboot.rs +++ b/noxis-rs/src/options/preboot.rs @@ -10,7 +10,7 @@ const SOCKET_PATH: &str = "/var/run/enode/hostagent.sock"; /// ## for setting up metrics mode as preboot param from command prompt /// /// examples: -/// ``` +/// ``` bash /// noxis-rs ... --metrics full /// noxis-rs ... --metrics system /// noxis-rs ... --metrics processes