From 93fbf50c8fbb478be5946ab04fa51a40d27fd448 Mon Sep 17 00:00:00 2001 From: tqcq <99722391+tqcq@users.noreply.github.com> Date: Fri, 8 Dec 2023 13:38:46 +0800 Subject: [PATCH] feature modify images --- .gitea/workflows/build.yaml | 10 ++++++---- .gitea/workflows/linux-hisiv500-gcc.yaml | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 3d9ca4e..50d17a3 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -82,13 +82,15 @@ jobs: export CUSTOM_CMAKE_ARGS="-DULIB_BUILD_TESTS=ON" ${{ env.build_command }} - - name: build-in-centos + - name: build-in-container uses: addnab/docker-run-action@v3 if: matrix.toolchain != 'host.toolchain.cmake' && matrix.toolchain != 'host-afl.toolchain.cmake' with: - image: tqcq/hisi:centos + + image: tqcq/ubuntu:hisi options: --rm --volumes-from ${{ env.JOB_CONTAINER_NAME }} run: | - yum clean all - yum install -y libarchive cmake make gcc gcc-c++ openssl-devel autoconf libtool pkg-config + cd ${{ github.workspace }} + sudo apt-get update + sudo apt-get install -y libarchive-dev libssl-dev autoconf libtool pkg-config cmake make gcc g++ ${{ env.build_command }} \ No newline at end of file diff --git a/.gitea/workflows/linux-hisiv500-gcc.yaml b/.gitea/workflows/linux-hisiv500-gcc.yaml index 732f41f..adece15 100644 --- a/.gitea/workflows/linux-hisiv500-gcc.yaml +++ b/.gitea/workflows/linux-hisiv500-gcc.yaml @@ -69,7 +69,7 @@ jobs: key: qemu-hisiv500-install-20231206-1 path: qemu-install - - name: build-in-centos + - name: build-in-container uses: addnab/docker-run-action@v3 with: image: tqcq/ubuntu:hisi