From 32b15d5942139ac01384605e3a834f2c2f1f5fd4 Mon Sep 17 00:00:00 2001 From: Zingo Andersen Date: Tue, 10 Dec 2024 17:24:26 +0100 Subject: [PATCH] Arm backend: Remove running examples/arm/setup.sh in the github docker This will move Arm PR testing to use an empty docker and examples/arm/setup.sh will always run from a fresh setup when testing a PR to minimize the risk of and old run of examples/arm/setup.sh done during docker creation colliding PR testing, or being out of sync with it. The different runs of examples/arm/setup.sh also used different install folders and that might break stuff even more. Signed-off-by: Zingo Andersen Change-Id: I795078d3d764a3f7ad5d6043fb8b70290af5789f --- .ci/docker/ubuntu/Dockerfile | 3 --- .github/workflows/docker-builds.yml | 4 ---- 2 files changed, 7 deletions(-) diff --git a/.ci/docker/ubuntu/Dockerfile b/.ci/docker/ubuntu/Dockerfile index f5b1824a783..5efa0825b96 100644 --- a/.ci/docker/ubuntu/Dockerfile +++ b/.ci/docker/ubuntu/Dockerfile @@ -79,9 +79,6 @@ RUN if [ -n "${ANDROID_NDK_VERSION}" ]; then bash ./install_android.sh; fi RUN rm install_android.sh ARG ARM_SDK -COPY --chown=ci-user:ci-user ./arm /opt/arm -# Set up ARM SDK if needed -RUN if [ -n "${ARM_SDK}" ]; then git config --global user.email "ossci@example.com"; git config --global user.name "OSS CI"; bash /opt/arm/setup.sh --i-agree-to-the-contained-eula /opt/arm-sdk; chown -R ci-user:ci-user /opt/arm-sdk; fi ARG QNN_SDK diff --git a/.github/workflows/docker-builds.yml b/.github/workflows/docker-builds.yml index ea25a0a7d30..73af9842a20 100644 --- a/.github/workflows/docker-builds.yml +++ b/.github/workflows/docker-builds.yml @@ -7,8 +7,6 @@ on: - .ci/docker/** - .github/workflows/docker-builds.yml - requirements-lintrunner.txt - - examples/arm/setup.sh - - examples/arm/ethos-u-setup/** push: branches: - main @@ -17,8 +15,6 @@ on: - .ci/docker/** - .github/workflows/docker-builds.yml - requirements-lintrunner.txt - - examples/arm/setup.sh - - examples/arm/ethos-u-setup/** schedule: - cron: 1 3 * * 3