summaryrefslogtreecommitdiffhomepage
path: root/scripts
diff options
context:
space:
mode:
authorIvan Zorin <[email protected]>2023-07-31 03:06:57 +0300
committerGitHub <[email protected]>2023-07-31 10:06:57 +1000
commite0f373a88a4e9badea76e518551769e7a8d23b97 (patch)
treeeb38ccd5547ace47ed5b0d28a9cdb98359c2cca0 /scripts
parent05d0ef66efea296ada9219d677e0d27f2f48a9e1 (diff)
downloadIronOS-e0f373a88a4e9badea76e518551769e7a8d23b97.tar.gz
IronOS-e0f373a88a4e9badea76e518551769e7a8d23b97.zip
Decomission of scripts/ci (#1760)
* Decomission of scripts/ci * Code review * Update .gitignore according to changes for code review
Diffstat (limited to 'scripts')
-rw-r--r--scripts/IronOS.Dockerfile1
-rwxr-xr-xscripts/ci/buildAll.sh21
-rw-r--r--scripts/ci/gcc-arm-none-eabi-10-2020-q4-major-x86_64-linux.tar.bz2.md51
-rw-r--r--scripts/ci/nuclei_riscv_newlibc_prebuilt_linux64_2020.08.tar.bz2.md51
-rwxr-xr-xscripts/deploy.sh3
5 files changed, 1 insertions, 26 deletions
diff --git a/scripts/IronOS.Dockerfile b/scripts/IronOS.Dockerfile
index 93cb5464..1543e1b0 100644
--- a/scripts/IronOS.Dockerfile
+++ b/scripts/IronOS.Dockerfile
@@ -33,4 +33,3 @@ RUN python3 -m pip install ${PIP_PKGS}
RUN git config --global --add safe.directory /build/ironos
COPY . /build/ironos
-COPY ./scripts/ci /build/ci
diff --git a/scripts/ci/buildAll.sh b/scripts/ci/buildAll.sh
deleted file mode 100755
index f5fcf067..00000000
--- a/scripts/ci/buildAll.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-set -e
-set -u
-
-# Init vars
-dir_ci="/build/ci"
-dir_ironos="/build/ironos"
-dir_source="${dir_ironos}/source"
-
-# Prepare output dir
-dir_artefacts="${dir_ci}/artefacts"
-mkdir -p "${dir_artefacts}"
-
-# Build firmware
-cd "${dir_source}"
-bash ./build.sh || exit 1
-echo "All Firmware built"
-
-# Copy out all the final resulting files we would like to store for the next op
-cp -r "${dir_source}"/Hexfile/*.bin "${dir_artefacts}"
-cp -r "${dir_source}"/Hexfile/*.hex "${dir_artefacts}"
diff --git a/scripts/ci/gcc-arm-none-eabi-10-2020-q4-major-x86_64-linux.tar.bz2.md5 b/scripts/ci/gcc-arm-none-eabi-10-2020-q4-major-x86_64-linux.tar.bz2.md5
deleted file mode 100644
index ebc9ecaf..00000000
--- a/scripts/ci/gcc-arm-none-eabi-10-2020-q4-major-x86_64-linux.tar.bz2.md5
+++ /dev/null
@@ -1 +0,0 @@
-8312c4c91799885f222f663fc81f9a31 gcc-arm-none-eabi-10-2020-q4-major-x86_64-linux.tar.bz2
diff --git a/scripts/ci/nuclei_riscv_newlibc_prebuilt_linux64_2020.08.tar.bz2.md5 b/scripts/ci/nuclei_riscv_newlibc_prebuilt_linux64_2020.08.tar.bz2.md5
deleted file mode 100644
index 2f4f5e33..00000000
--- a/scripts/ci/nuclei_riscv_newlibc_prebuilt_linux64_2020.08.tar.bz2.md5
+++ /dev/null
@@ -1 +0,0 @@
-add5b6a9b12987d0e72f55a4d2cd0f3b nuclei_riscv_newlibc_prebuilt_linux64_2020.08.tar.bz2
diff --git a/scripts/deploy.sh b/scripts/deploy.sh
index 97fd0c74..28057788 100755
--- a/scripts/deploy.sh
+++ b/scripts/deploy.sh
@@ -191,7 +191,7 @@ fi;
if [ -z "${cmd}" ] || [ "${cmd}" = "shell" ]; then
docker_cmd="run --rm builder"
elif [ "${cmd}" = "build" ]; then
- docker_cmd="run --rm builder /bin/bash /build/ci/buildAll.sh"
+ docker_cmd="run --rm builder make build-all OUT=${OUT}"
elif [ "${cmd}" = "clean" ]; then
docker rmi ironos-builder:latest
exit "${?}"
@@ -211,4 +211,3 @@ echo -e "\t* type \"${0} clean\" to delete created container (but not cached dat
echo -e "\n====>>>> ${docker_bin} ${docker_file} ${docker_cmd}\n"
eval "${docker_bin} ${docker_file} ${docker_cmd}"
exit "${?}"
-