Skip to content

Commit 9381924

Browse files
authored
[infra] Replace nnas docker-run with direct docker commands (#16230)
This commit replaces the `nnas docker-run` command with direct docker run commands in the CI workflow. `nnas docker-run` command set user as directory owner, but directory owner ID in github action is 1001, not root. So it causes permission error when running `nnas docker-run` command. ONE-DCO-1.0-Signed-off-by: Hyeongseok Oh <hseok82.oh@samsung.com>
1 parent 86172eb commit 9381924

File tree

1 file changed

+4
-12
lines changed

1 file changed

+4
-12
lines changed

.github/workflows/build-dev-docker.yml

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,9 @@ jobs:
5858
5959
- name: Test onert build
6060
if: matrix.version != 'focal' # not supported
61-
env:
62-
DOCKER_IMAGE_NAME: one-test
6361
run: |
64-
./nnas docker-run --user make -f Makefile.template
65-
./nnas docker-run --user Product/out/test/onert-test unittest
62+
docker run --rm -u root -v "${PWD}:${PWD}" -w "${PWD}" one-test make -f Makefile.template
63+
docker run --rm -u root -v "${PWD}:${PWD}" -w "${PWD}" one-test Product/out/test/onert-test unittest
6664
6765
- name: Download rootfs for cross build
6866
uses: dawidd6/action-download-artifact@v7
@@ -75,16 +73,13 @@ jobs:
7573
# Workaround: symlink for rootfs checker in cmake toolchain file
7674
- name: Install rootfs and cross build
7775
if: matrix.version != 'focal' # not supported
78-
env:
79-
DOCKER_IMAGE_NAME: one-test
80-
DOCKER_ENV_VARS: '-e CROSS_BUILD=1 -e TARGET_ARCH=armv7l'
8176
run: |
8277
mkdir -p tools/cross/rootfs
8378
tar -zxf rootfs_arm_${{ matrix.version }}.tar.gz -C tools/cross/rootfs
8479
pushd tools/cross/rootfs/arm
8580
ln -sf usr/lib lib
8681
popd
87-
./nnas docker-run --user make -f Makefile.template
82+
docker run --rm -u root -v "${PWD}:${PWD}" -w "${PWD}" -e CROSS_BUILD=1 -e TARGET_ARCH=armv7l one-test make -f Makefile.template
8883
8984
build-android:
9085
needs: filtering
@@ -99,8 +94,5 @@ jobs:
9994
docker build --file infra/docker/android-sdk/Dockerfile --tag one-test .
10095
10196
- name: Test onert build
102-
env:
103-
DOCKER_IMAGE_NAME: one-test
104-
DOCKER_ENV_VARS: '-e CROSS_BUILD=1 -e TARGET_OS=android -e BUILD_TYPE=release'
10597
run: |
106-
./nnas docker-run --user make -f Makefile.template
98+
docker run --rm -u root -v "${PWD}:${PWD}" -w "${PWD}" -e CROSS_BUILD=1 -e TARGET_OS=android -e BUILD_TYPE=release one-test make -f Makefile.template

0 commit comments

Comments
 (0)