diff --git a/.github/workflows/build-cn10k-nginx.yml b/.github/workflows/build-cn10k-nginx.yml index 8fd308e..5745c44 100644 --- a/.github/workflows/build-cn10k-nginx.yml +++ b/.github/workflows/build-cn10k-nginx.yml @@ -99,8 +99,8 @@ jobs: cd .. mv "${PWD}/install" "${PWD}/openssl-${OPENSSL_VERSION}-cn10k${PKG_POSTFIX}_${PKG_VERSION_NAME}_arm64" dpkg --build "openssl-${OPENSSL_VERSION}-cn10k${PKG_POSTFIX}_${PKG_VERSION_NAME}_arm64" - cp -r "openssl-${OPENSSL_VERSION}-cn10k${PKG_POSTFIX}_${PKG_VERSION_NAME}_arm64.deb" ${PWD}/artifacts/. - apt-get install ./openssl-${OPENSSL_VERSION}-cn10k${PKG_POSTFIX}_${PKG_VERSION_NAME}_arm64.deb + cp -r "openssl-${OPENSSL_VERSION}-cn10k${PKG_POSTFIX}_${PKG_VERSION_NAME}_arm64.deb" ${BASE_DIR}/artifacts/. + sudo apt-get install ./openssl-${OPENSSL_VERSION}-cn10k${PKG_POSTFIX}_${PKG_VERSION_NAME}_arm64.deb cd .. PCRE_PATCH_VERSION=$(ls patches/nginx/deps/pcre | head -n 1) PCRE_VERSION=${PCRE_PATCH_VERSION#v} @@ -142,7 +142,7 @@ jobs: cd .. mv "${PWD}/install" "${PWD}/nginx-${NGINX_VERSION}-cn10k${PKG_POSTFIX}_${PKG_VERSION_NAME}_arm64" dpkg --build "${PWD}/nginx-${NGINX_VERSION}-cn10k${PKG_POSTFIX}_${PKG_VERSION_NAME}_arm64" - cp "${PWD}/nginx-${NGINX_VERSION}-cn10k${PKG_POSTFIX}_${PKG_VERSION_NAME}_arm64.deb" ${PWD}/artifacts/. + cp "${PWD}/nginx-${NGINX_VERSION}-cn10k${PKG_POSTFIX}_${PKG_VERSION_NAME}_arm64.deb" ${BASE_DIR}/artifacts/. - name: Export version name id: artifacts run: | diff --git a/.github/workflows/build-cn10k-openssl-engine.yml b/.github/workflows/build-cn10k-openssl-engine.yml index 7ddd3bb..9c7c817 100644 --- a/.github/workflows/build-cn10k-openssl-engine.yml +++ b/.github/workflows/build-cn10k-openssl-engine.yml @@ -86,11 +86,13 @@ jobs: cd .. export OPENSSL_INSTALL=$BASE_DIR/openssl-${OPENSSL_VERSION} wget "https://github.com/MarvellEmbeddedProcessors/marvell-dpdk/releases/download/dpdk-cn10k-${DPDK_BASE_PKG_VERSION}_${DPDK_PKG_VERSION}-${DISTRO}-${DPDK_PKG_VERSION}/dpdk-${DPDK_BASE_PKG_VERSION}-cn10k_${DPDK_PKG_VERSION}_arm64.deb" - apt-get install -y ./"dpdk-${DPDK_BASE_PKG_VERSION}-cn10k_${DPDK_PKG_VERSION}_arm64.deb" + sudo apt-get install -y ./"dpdk-${DPDK_BASE_PKG_VERSION}-cn10k_${DPDK_PKG_VERSION}_arm64.deb" git clone "https://github.com/MarvellEmbeddedProcessors/marvell-openssl-engine.git" cd "${PWD}/marvell-openssl-engine" - echo "ENGINE_VERSION=`cat localversion`" >> "${PWD}/artifacts/env" - echo "CPT_PKG_VERSION=`cat CPT_PKG_VERSION`" >> "${PWD}/artifacts/env" + ENGINE_VERSION=`cat localversion` + echo "ENGINE_VERSION=`cat localversion`" >> "${BASE_DIR}/artifacts/env" + CPT_PKG_VERSION=`cat CPT_PKG_VERSION` + echo "CPT_PKG_VERSION=`cat CPT_PKG_VERSION`" >> "${BASE_DIR}/artifacts/env" export DPDK_INSTALL=/ export CFLAGS="-Wno-error=implicit-function-declaration" make OTX2=y OSSL_CONF=y DPDK_PC=$DPDK_INSTALL/usr/lib/aarch64-linux-gnu/pkgconfig/ @@ -111,7 +113,7 @@ jobs: cd .. mv "${PWD}/install" "${PWD}/openssl-engine-${ENGINE_VERSION}-cn10k${PKG_POSTFIX}_${PKG_VERSION_NAME}_arm64" dpkg --build "openssl-engine-${ENGINE_VERSION}-cn10k${PKG_POSTFIX}_${PKG_VERSION_NAME}_arm64" - cp -r "openssl-engine-${ENGINE_VERSION}-cn10k${PKG_POSTFIX}_${PKG_VERSION_NAME}_arm64.deb" ${PWD}/artifacts/. + cp -r "openssl-engine-${ENGINE_VERSION}-cn10k${PKG_POSTFIX}_${PKG_VERSION_NAME}_arm64.deb" ${BASE_DIR}/artifacts/. - name: Export version name id: artifacts run: | diff --git a/.github/workflows/build-cn10k-ovs.yml b/.github/workflows/build-cn10k-ovs.yml index 01a715f..345b3b7 100644 --- a/.github/workflows/build-cn10k-ovs.yml +++ b/.github/workflows/build-cn10k-ovs.yml @@ -64,7 +64,7 @@ jobs: source "${PWD}/artifacts/env" echo "DISTRO=${DISTRO}" >> ${PWD}/artifacts/env wget "https://github.com/MarvellEmbeddedProcessors/marvell-dpdk/releases/download/dpdk-cn10k-${DPDK_BASE_PKG_VERSION}_${DPDK_PKG_VERSION}-${DISTRO}-${DPDK_PKG_VERSION}/dpdk-${DPDK_BASE_PKG_VERSION}-cn10k_${DPDK_PKG_VERSION}_arm64.deb" - apt-get install -y ./"dpdk-${DPDK_BASE_PKG_VERSION}-cn10k_${DPDK_PKG_VERSION}_arm64.deb" + sudo apt-get install -y ./"dpdk-${DPDK_BASE_PKG_VERSION}-cn10k_${DPDK_PKG_VERSION}_arm64.deb" export CC='ccache gcc-14' echo "cache_dir = ~/.ccache" > ~/.ccache/ccache.conf ccache -p @@ -97,7 +97,7 @@ jobs: cd - mv "${PWD}/install" "${PWD}/ovs-${OVS_VERSION}-cn10k${PKG_POSTFIX}_${PKG_VERSION_NAME}_arm64" dpkg --build "${PWD}/ovs-${OVS_VERSION}-cn10k${PKG_POSTFIX}_${PKG_VERSION_NAME}_arm64" - cp "${PWD}/ovs-${OVS_VERSION}-cn10k${PKG_POSTFIX}_${PKG_VERSION_NAME}_arm64.deb" ${PWD}/artifacts/. + cp "${PWD}/ovs-${OVS_VERSION}-cn10k${PKG_POSTFIX}_${PKG_VERSION_NAME}_arm64.deb" ${BASE_DIR}/artifacts/. - name: Export version name id: artifacts run: | diff --git a/.github/workflows/build-cn10k.yml b/.github/workflows/build-cn10k.yml index 9c2e1b7..204cae3 100644 --- a/.github/workflows/build-cn10k.yml +++ b/.github/workflows/build-cn10k.yml @@ -49,22 +49,23 @@ jobs: id: build run: | mkdir -p ~/.ccache - apt-get update -q -y - apt-get install -y build-essential gcc meson ccache git doxygen apt-utils - apt-get install -y libnl-3-dev libnl-route-3-dev libnl-xfrm-3-dev - apt-get install -y sphinx-common python3-sphinx-rtd-theme pkg-config - apt-get install -y libarchive-dev libbsd-dev libbpf-dev - apt-get install -y libfdt-dev libjansson-dev software-properties-common - apt-get install -y libssl-dev ninja-build python3-pip - apt-get install -y python3-pyelftools python3-setuptools python3-wheel zlib1g-dev - apt-get install -y gcc-14 bzip2-doc icu-devtools libacl1-dev libattr1-dev - apt-get install -y libbz2-dev libgmp-dev libgmpxx4ldbl libicu-dev liblz4-dev - apt-get install -y liblzma-dev libxml2-dev libzstd-dev nettle-dev wget lsb-release + sudo apt-get update -q -y + sudo apt-get install -y build-essential gcc meson ccache git doxygen apt-utils + sudo apt-get install -y libnl-3-dev libnl-route-3-dev libnl-xfrm-3-dev + sudo apt-get install -y sphinx-common python3-sphinx-rtd-theme pkg-config + sudo apt-get install -y libarchive-dev libbsd-dev libbpf-dev + sudo apt-get install -y libfdt-dev libjansson-dev software-properties-common + sudo apt-get install -y libssl-dev ninja-build python3-pip + sudo apt-get install -y python3-pyelftools python3-setuptools python3-wheel zlib1g-dev + sudo apt-get install -y gcc-14 bzip2-doc icu-devtools libacl1-dev libattr1-dev + sudo apt-get install -y libbz2-dev libgmp-dev libgmpxx4ldbl libicu-dev liblz4-dev + sudo apt-get install -y liblzma-dev libxml2-dev libzstd-dev nettle-dev wget lsb-release DISTRO=ubuntu-`lsb_release -rs` source "${PWD}/artifacts/env" echo "DISTRO=${DISTRO}" >> ${PWD}/artifacts/env + BASE_DIR=${PWD} wget "https://github.com/MarvellEmbeddedProcessors/marvell-dpdk/releases/download/dpdk-cn10k-${DPDK_BASE_PKG_VERSION}_${DPDK_PKG_VERSION}-${DISTRO}-${DPDK_PKG_VERSION}/dpdk-${DPDK_BASE_PKG_VERSION}-cn10k_${DPDK_PKG_VERSION}_arm64.deb" - apt-get install -y ./"dpdk-${DPDK_BASE_PKG_VERSION}-cn10k_${DPDK_PKG_VERSION}_arm64.deb" + sudo apt-get install -y ./"dpdk-${DPDK_BASE_PKG_VERSION}-cn10k_${DPDK_PKG_VERSION}_arm64.deb" export CC='ccache gcc-14' echo "cache_dir = ~/.ccache" > ~/.ccache/ccache.conf ccache -p @@ -83,7 +84,7 @@ jobs: cd - mv "${PWD}/install" "${PWD}/dao-cn10k${PKG_POSTFIX}_${PKG_VERSION_NAME}_arm64" dpkg --build "dao-cn10k${PKG_POSTFIX}_${PKG_VERSION_NAME}_arm64" - cp "dao-cn10k${PKG_POSTFIX}_${PKG_VERSION_NAME}_arm64.deb" ${PWD}/artifacts/. + cp "dao-cn10k${PKG_POSTFIX}_${PKG_VERSION_NAME}_arm64.deb" ${BASE_DIR}/artifacts/. mkdir -p gen_docs mv build/doc/guides/html gen_docs/guides mv build/doc/api/html gen_docs/api diff --git a/.github/workflows/build-cn9k-nginx.yml b/.github/workflows/build-cn9k-nginx.yml index e2366a3..19f774c 100644 --- a/.github/workflows/build-cn9k-nginx.yml +++ b/.github/workflows/build-cn9k-nginx.yml @@ -99,8 +99,8 @@ jobs: cd .. mv "${PWD}/install" "${PWD}/openssl-${OPENSSL_VERSION}-cn9k${PKG_POSTFIX}_${PKG_VERSION_NAME}_arm64" dpkg --build "openssl-${OPENSSL_VERSION}-cn9k${PKG_POSTFIX}_${PKG_VERSION_NAME}_arm64" - cp -r "openssl-${OPENSSL_VERSION}-cn9k${PKG_POSTFIX}_${PKG_VERSION_NAME}_arm64.deb" ${PWD}/artifacts/. - apt-get install ./openssl-${OPENSSL_VERSION}-cn9k${PKG_POSTFIX}_${PKG_VERSION_NAME}_arm64.deb + cp -r "openssl-${OPENSSL_VERSION}-cn9k${PKG_POSTFIX}_${PKG_VERSION_NAME}_arm64.deb" ${BASE_DIR}/artifacts/. + sudo apt-get install ./openssl-${OPENSSL_VERSION}-cn9k${PKG_POSTFIX}_${PKG_VERSION_NAME}_arm64.deb cd .. PCRE_PATCH_VERSION=$(ls patches/nginx/deps/pcre | head -n 1) PCRE_VERSION=${PCRE_PATCH_VERSION#v} @@ -142,7 +142,7 @@ jobs: cd .. mv "${PWD}/install" "${PWD}/nginx-${NGINX_VERSION}-cn9k${PKG_POSTFIX}_${PKG_VERSION_NAME}_arm64" dpkg --build "${PWD}/nginx-${NGINX_VERSION}-cn9k${PKG_POSTFIX}_${PKG_VERSION_NAME}_arm64" - cp "${PWD}/nginx-${NGINX_VERSION}-cn9k${PKG_POSTFIX}_${PKG_VERSION_NAME}_arm64.deb" ${PWD}/artifacts/. + cp "${PWD}/nginx-${NGINX_VERSION}-cn9k${PKG_POSTFIX}_${PKG_VERSION_NAME}_arm64.deb" ${BASE_DIR}/artifacts/. - name: Export version name id: artifacts run: | diff --git a/.github/workflows/build-cn9k-openssl-engine.yml b/.github/workflows/build-cn9k-openssl-engine.yml index 9448143..b1ffc7a 100644 --- a/.github/workflows/build-cn9k-openssl-engine.yml +++ b/.github/workflows/build-cn9k-openssl-engine.yml @@ -86,11 +86,13 @@ jobs: cd .. export OPENSSL_INSTALL=$BASE_DIR/openssl-${OPENSSL_VERSION} wget "https://github.com/MarvellEmbeddedProcessors/marvell-dpdk/releases/download/dpdk-cn9k-${DPDK_BASE_PKG_VERSION}_${DPDK_PKG_VERSION}-${DISTRO}-${DPDK_PKG_VERSION}/dpdk-${DPDK_BASE_PKG_VERSION}-cn9k_${DPDK_PKG_VERSION}_arm64.deb" - apt-get install -y ./"dpdk-${DPDK_BASE_PKG_VERSION}-cn9k_${DPDK_PKG_VERSION}_arm64.deb" + sudo apt-get install -y ./"dpdk-${DPDK_BASE_PKG_VERSION}-cn9k_${DPDK_PKG_VERSION}_arm64.deb" git clone "https://github.com/MarvellEmbeddedProcessors/marvell-openssl-engine.git" cd "${PWD}/marvell-openssl-engine" - echo "ENGINE_VERSION=`cat localversion`" >> "${PWD}/artifacts/env" - echo "CPT_PKG_VERSION=`cat CPT_PKG_VERSION`" >> "${PWD}/artifacts/env" + ENGINE_VERSION=`cat localversion` + echo "ENGINE_VERSION=`cat localversion`" >> "${BASE_DIR}/artifacts/env" + CPT_PKG_VERSION=`cat CPT_PKG_VERSION` + echo "CPT_PKG_VERSION=`cat CPT_PKG_VERSION`" >> "${BASE_DIR}/artifacts/env" export DPDK_INSTALL=/ export CFLAGS="-Wno-error=implicit-function-declaration" make OTX2=y OSSL_CONF=y DPDK_PC=$DPDK_INSTALL/usr/lib/aarch64-linux-gnu/pkgconfig/ @@ -111,7 +113,7 @@ jobs: cd .. mv "${PWD}/install" "${PWD}/openssl-engine-${ENGINE_VERSION}-cn9k${PKG_POSTFIX}_${PKG_VERSION_NAME}_arm64" dpkg --build "openssl-engine-${ENGINE_VERSION}-cn9k${PKG_POSTFIX}_${PKG_VERSION_NAME}_arm64" - cp -r "openssl-engine-${ENGINE_VERSION}-cn9k${PKG_POSTFIX}_${PKG_VERSION_NAME}_arm64.deb" ${PWD}/artifacts/. + cp -r "openssl-engine-${ENGINE_VERSION}-cn9k${PKG_POSTFIX}_${PKG_VERSION_NAME}_arm64.deb" ${BASE_DIR}/artifacts/. - name: Export version name id: artifacts run: |