From d77df5a27ac837aee434709f610c4fff7e7c7f92 Mon Sep 17 00:00:00 2001 From: Pete Johanson Date: Mon, 8 Jun 2020 11:31:32 -0400 Subject: Action directory name fix. --- .github/actions/west/Dockerfile | 57 ---------------------------------- .github/actions/west/action.yml | 16 ---------- .github/actions/zephyr-west/Dockerfile | 57 ++++++++++++++++++++++++++++++++++ .github/actions/zephyr-west/action.yml | 16 ++++++++++ 4 files changed, 73 insertions(+), 73 deletions(-) delete mode 100644 .github/actions/west/Dockerfile delete mode 100644 .github/actions/west/action.yml create mode 100644 .github/actions/zephyr-west/Dockerfile create mode 100644 .github/actions/zephyr-west/action.yml (limited to '.github') diff --git a/.github/actions/west/Dockerfile b/.github/actions/west/Dockerfile deleted file mode 100644 index 687ba1e..0000000 --- a/.github/actions/west/Dockerfile +++ /dev/null @@ -1,57 +0,0 @@ -FROM debian:stable-slim - -RUN apt-get -y update && \ - apt-get -y upgrade && \ - apt-get install --no-install-recommends -y \ - wget \ - ca-certificates \ - autoconf \ - automake \ - build-essential \ - ccache \ - device-tree-compiler \ - dfu-util \ - file \ - g++ \ - gcc \ - gcc-multilib \ - git \ - iproute2 \ - libpcap-dev \ - libtool \ - make \ - ninja-build \ - python3-dev \ - python3-pip \ - python3-setuptools \ - xz-utils && \ - rm -rf /var/lib/apt/lists/* - -ARG ZSDK_VERSION=0.11.2 -RUN wget -q "https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v${ZSDK_VERSION}/zephyr-toolchain-arm-${ZSDK_VERSION}-setup.run" && \ - sh "zephyr-toolchain-arm-${ZSDK_VERSION}-setup.run" --quiet -- -d /opt/toolchains/zephyr-sdk-${ZSDK_VERSION} && \ - rm "zephyr-toolchain-arm-${ZSDK_VERSION}-setup.run" - -ARG CMAKE_VERSION=3.16.2 -RUN wget -q https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}-Linux-x86_64.sh && \ - chmod +x cmake-${CMAKE_VERSION}-Linux-x86_64.sh && \ - ./cmake-${CMAKE_VERSION}-Linux-x86_64.sh --skip-license --prefix=/usr/local && \ - rm -f ./cmake-${CMAKE_VERSION}-Linux-x86_64.sh - -ENV DEBIAN_FRONTEND noninteractive - -RUN wget -q https://raw.githubusercontent.com/zephyrproject-rtos/zephyr/master/scripts/requirements.txt && \ - wget -q https://raw.githubusercontent.com/zephyrproject-rtos/zephyr/master/scripts/requirements-base.txt && \ - wget -q https://raw.githubusercontent.com/zephyrproject-rtos/zephyr/master/scripts/requirements-build-test.txt && \ - wget -q https://raw.githubusercontent.com/zephyrproject-rtos/zephyr/master/scripts/requirements-doc.txt && \ - wget -q https://raw.githubusercontent.com/zephyrproject-rtos/zephyr/master/scripts/requirements-run-test.txt && \ - wget -q https://raw.githubusercontent.com/zephyrproject-rtos/zephyr/master/scripts/requirements-extras.txt && \ - pip3 install wheel && \ - pip3 install -r requirements.txt && \ - pip3 install west && \ - pip3 install sh - -ENV ZEPHYR_TOOLCHAIN_VARIANT=zephyr -ENV ZEPHYR_SDK_INSTALL_DIR=/opt/toolchains/zephyr-sdk-${ZSDK_VERSION} - -ENTRYPOINT ["west"] diff --git a/.github/actions/west/action.yml b/.github/actions/west/action.yml deleted file mode 100644 index 2498f74..0000000 --- a/.github/actions/west/action.yml +++ /dev/null @@ -1,16 +0,0 @@ -name: "Zephyr West" -description: 'Action incorporating Zephyr dependencies and West build tool' -inputs: - command: # id of input - description: 'Which west command to execute' - required: true - default: 'build' - command-args: # id of input - description: 'Extra arguments for the west command' - required: false -runs: - using: 'docker' - image: 'Dockerfile' - args: - - ${{ inputs.command }} - - ${{ inputs.command-args }} diff --git a/.github/actions/zephyr-west/Dockerfile b/.github/actions/zephyr-west/Dockerfile new file mode 100644 index 0000000..687ba1e --- /dev/null +++ b/.github/actions/zephyr-west/Dockerfile @@ -0,0 +1,57 @@ +FROM debian:stable-slim + +RUN apt-get -y update && \ + apt-get -y upgrade && \ + apt-get install --no-install-recommends -y \ + wget \ + ca-certificates \ + autoconf \ + automake \ + build-essential \ + ccache \ + device-tree-compiler \ + dfu-util \ + file \ + g++ \ + gcc \ + gcc-multilib \ + git \ + iproute2 \ + libpcap-dev \ + libtool \ + make \ + ninja-build \ + python3-dev \ + python3-pip \ + python3-setuptools \ + xz-utils && \ + rm -rf /var/lib/apt/lists/* + +ARG ZSDK_VERSION=0.11.2 +RUN wget -q "https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v${ZSDK_VERSION}/zephyr-toolchain-arm-${ZSDK_VERSION}-setup.run" && \ + sh "zephyr-toolchain-arm-${ZSDK_VERSION}-setup.run" --quiet -- -d /opt/toolchains/zephyr-sdk-${ZSDK_VERSION} && \ + rm "zephyr-toolchain-arm-${ZSDK_VERSION}-setup.run" + +ARG CMAKE_VERSION=3.16.2 +RUN wget -q https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}-Linux-x86_64.sh && \ + chmod +x cmake-${CMAKE_VERSION}-Linux-x86_64.sh && \ + ./cmake-${CMAKE_VERSION}-Linux-x86_64.sh --skip-license --prefix=/usr/local && \ + rm -f ./cmake-${CMAKE_VERSION}-Linux-x86_64.sh + +ENV DEBIAN_FRONTEND noninteractive + +RUN wget -q https://raw.githubusercontent.com/zephyrproject-rtos/zephyr/master/scripts/requirements.txt && \ + wget -q https://raw.githubusercontent.com/zephyrproject-rtos/zephyr/master/scripts/requirements-base.txt && \ + wget -q https://raw.githubusercontent.com/zephyrproject-rtos/zephyr/master/scripts/requirements-build-test.txt && \ + wget -q https://raw.githubusercontent.com/zephyrproject-rtos/zephyr/master/scripts/requirements-doc.txt && \ + wget -q https://raw.githubusercontent.com/zephyrproject-rtos/zephyr/master/scripts/requirements-run-test.txt && \ + wget -q https://raw.githubusercontent.com/zephyrproject-rtos/zephyr/master/scripts/requirements-extras.txt && \ + pip3 install wheel && \ + pip3 install -r requirements.txt && \ + pip3 install west && \ + pip3 install sh + +ENV ZEPHYR_TOOLCHAIN_VARIANT=zephyr +ENV ZEPHYR_SDK_INSTALL_DIR=/opt/toolchains/zephyr-sdk-${ZSDK_VERSION} + +ENTRYPOINT ["west"] diff --git a/.github/actions/zephyr-west/action.yml b/.github/actions/zephyr-west/action.yml new file mode 100644 index 0000000..2498f74 --- /dev/null +++ b/.github/actions/zephyr-west/action.yml @@ -0,0 +1,16 @@ +name: "Zephyr West" +description: 'Action incorporating Zephyr dependencies and West build tool' +inputs: + command: # id of input + description: 'Which west command to execute' + required: true + default: 'build' + command-args: # id of input + description: 'Extra arguments for the west command' + required: false +runs: + using: 'docker' + image: 'Dockerfile' + args: + - ${{ inputs.command }} + - ${{ inputs.command-args }} -- cgit v1.2.3