diff options
| -rw-r--r-- | .github/workflows/build.yml | 27 | ||||
| -rw-r--r-- | .github/workflows/test.yml | 28 |
2 files changed, 14 insertions, 41 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fd52d7c..66351e2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -13,6 +13,8 @@ on: jobs: build: runs-on: ubuntu-latest + container: + image: zmkfirmware/zmk-build-arm:2.3 strategy: matrix: board: @@ -82,25 +84,13 @@ jobs: timeout-minutes: 2 continue-on-error: true - name: West init - uses: "docker://zmkfirmware/zephyr-west-action-arm:latest" - id: west-init - with: - args: 'init "-l app"' + run: west init -l app - name: West update - uses: "docker://zmkfirmware/zephyr-west-action-arm:latest" - id: west-update - with: - args: "update" + run: west update - name: West config Zephyr base - uses: "docker://zmkfirmware/zephyr-west-action-arm:latest" - id: west-config - with: - args: 'config "--global zephyr.base-prefer configfile"' + run: west config --global zephyr.base-prefer configfile - name: West Zephyr export - uses: "docker://zmkfirmware/zephyr-west-action-arm:latest" - id: west-zephyr-export - with: - args: "zephyr-export" + run: west zephyr-export - name: Prepare variables id: variables run: | @@ -117,10 +107,7 @@ jobs: echo ::set-output name=shield-arg::${SHIELD_ARG} echo ::set-output name=artifact-name::${ARTIFACT_NAME} - name: West build - uses: "docker://zmkfirmware/zephyr-west-action-arm:latest" - id: west-build - with: - args: 'build "-s app -b ${{ matrix.board }} -- ${{ steps.variables.outputs.shield-arg }}' + run: west build -s app -b ${{ matrix.board }} -- ${{ steps.variables.outputs.shield-arg }} - name: Archive build uses: actions/upload-artifact@v2 with: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index c283e49..9e594d3 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -15,6 +15,8 @@ on: jobs: integration_test: runs-on: ubuntu-latest + container: + image: zmkfirmware/zmk-build-arm:2.3 steps: # To use this repository's private action, # you must check out the repository @@ -38,31 +40,15 @@ jobs: timeout-minutes: 2 continue-on-error: true - name: West init - uses: "docker://zmkfirmware/zephyr-west-action-arm:latest" - id: west-init - with: - args: 'init "-l app"' + run: west init -l app - name: West update - uses: "docker://zmkfirmware/zephyr-west-action-arm:latest" - id: west-update - with: - args: "update" + run: west update - name: West config Zephyr base - uses: "docker://zmkfirmware/zephyr-west-action-arm:latest" - id: west-config - with: - args: 'config "--global zephyr.base-prefer configfile"' + run: west config --global zephyr.base-prefer configfile - name: West Zephyr export - uses: "docker://zmkfirmware/zephyr-west-action-arm:latest" - id: west-zephyr-export - with: - args: "zephyr-export" + run: west zephyr-export - name: Test all - uses: "docker://zmkfirmware/zephyr-west-action-arm:latest" - id: west-build - with: - entrypoint: /bin/bash - args: '-c "west test"' + run: west test - name: Archive build if: ${{ always() }} uses: actions/upload-artifact@v2 |