From d568df7bc98f9f386e0dbda2befcef711211927b Mon Sep 17 00:00:00 2001 From: Pete Johanson Date: Mon, 8 Jun 2020 21:53:48 -0400 Subject: [PATCH] Move to published action for zephyr/west usage. --- .github/actions/zephyr-west/Dockerfile | 60 ----------------------- .github/actions/zephyr-west/action.yml | 16 ------ .github/actions/zephyr-west/entrypoint.sh | 3 -- .github/workflows/build.yml | 10 ++-- 4 files changed, 5 insertions(+), 84 deletions(-) delete mode 100644 .github/actions/zephyr-west/Dockerfile delete mode 100644 .github/actions/zephyr-west/action.yml delete mode 100644 .github/actions/zephyr-west/entrypoint.sh diff --git a/.github/actions/zephyr-west/Dockerfile b/.github/actions/zephyr-west/Dockerfile deleted file mode 100644 index 00c42384..00000000 --- a/.github/actions/zephyr-west/Dockerfile +++ /dev/null @@ -1,60 +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} - -COPY ./entrypoint.sh /entrypoint.sh -RUN chmod +x /entrypoint.sh - -ENTRYPOINT ["/entrypoint.sh"] diff --git a/.github/actions/zephyr-west/action.yml b/.github/actions/zephyr-west/action.yml deleted file mode 100644 index 2498f741..00000000 --- a/.github/actions/zephyr-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/entrypoint.sh b/.github/actions/zephyr-west/entrypoint.sh deleted file mode 100644 index 9d985eb6..00000000 --- a/.github/actions/zephyr-west/entrypoint.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -west $1 $2 diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5fc8df18..4525aef5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -25,29 +25,29 @@ jobs: ${{ runner.os }}-build- ${{ runner.os }}- - name: West Init - uses: ./.github/actions/zephyr-west # Uses an action in the root directory + uses: zmkfirmware/zephyr-west-action@v0.1.0 id: west-init with: command: 'init' command-args: '-l app' - name: West Update - uses: ./.github/actions/zephyr-west # Uses an action in the root directory + uses: zmkfirmware/zephyr-west-action@v0.1.0 id: west-update with: command: 'update' - name: West Config Zephyr Base - uses: ./.github/actions/zephyr-west # Uses an action in the root directory + uses: zmkfirmware/zephyr-west-action@v0.1.0 id: west-config with: command: 'config' command-args: '--global zephyr.base-prefer configfile' - name: West Zephyr Export - uses: ./.github/actions/zephyr-west # Uses an action in the root directory + uses: zmkfirmware/zephyr-west-action@v0.1.0 id: west-zephyr-export with: command: 'zephyr-export' - name: West Build - uses: ./.github/actions/zephyr-west # Uses an action in the root directory + uses: zmkfirmware/zephyr-west-action@v0.1.0 id: west-build with: command: 'build'