From 9f650acbd0aafdd22a9cb6e19fd8f9faabd2568e Mon Sep 17 00:00:00 2001 From: Pete Johanson Date: Fri, 12 Jun 2020 11:09:32 -0400 Subject: [PATCH 1/8] Update one workflow step to use docker container. --- .github/workflows/build.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b909dcfe..d9866d09 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -27,11 +27,10 @@ jobs: ${{ runner.os }}-build- ${{ runner.os }}- - name: West Init - uses: zmkfirmware/zephyr-west-action@v0.1.0 + uses: docker://docker.pkg.github.com/zmkfirmware/zephyr-west-action/zephyr-west-action:latest id: west-init with: - command: 'init' - command-args: '-l app' + args: 'init' '-l app' - name: West Update uses: zmkfirmware/zephyr-west-action@v0.1.0 id: west-update From 2aa932a943a2db344ce8ddcbae3854d27e712637 Mon Sep 17 00:00:00 2001 From: Pete Johanson Date: Fri, 12 Jun 2020 11:12:16 -0400 Subject: [PATCH 2/8] Try quoting a few values. --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d9866d09..c9d73665 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -27,10 +27,10 @@ jobs: ${{ runner.os }}-build- ${{ runner.os }}- - name: West Init - uses: docker://docker.pkg.github.com/zmkfirmware/zephyr-west-action/zephyr-west-action:latest + uses: 'docker://docker.pkg.github.com/zmkfirmware/zephyr-west-action/zephyr-west-action:latest' id: west-init with: - args: 'init' '-l app' + args: "'init' '-l app'" - name: West Update uses: zmkfirmware/zephyr-west-action@v0.1.0 id: west-update From ea36f2a93e6e50eeb2951883cab6f27a09e00c8e Mon Sep 17 00:00:00 2001 From: Pete Johanson Date: Fri, 12 Jun 2020 11:26:32 -0400 Subject: [PATCH 3/8] Try logging into the registry first. --- .github/workflows/build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c9d73665..a50c0c50 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -26,6 +26,8 @@ jobs: ${{ runner.os }}-build-${{ env.cache-name }}- ${{ runner.os }}-build- ${{ runner.os }}- + - name: Log into registry + run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login docker.pkg.github.com -u ${{ github.actor }} --password-stdin - name: West Init uses: 'docker://docker.pkg.github.com/zmkfirmware/zephyr-west-action/zephyr-west-action:latest' id: west-init From 30f23fe5da0feaf51b74649e0ce9a7b77bf0152e Mon Sep 17 00:00:00 2001 From: Pete Johanson Date: Fri, 12 Jun 2020 16:21:10 -0400 Subject: [PATCH 4/8] Switch to Docker Hub version. --- .github/workflows/build.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a50c0c50..4271daa9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -26,10 +26,8 @@ jobs: ${{ runner.os }}-build-${{ env.cache-name }}- ${{ runner.os }}-build- ${{ runner.os }}- - - name: Log into registry - run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login docker.pkg.github.com -u ${{ github.actor }} --password-stdin - name: West Init - uses: 'docker://docker.pkg.github.com/zmkfirmware/zephyr-west-action/zephyr-west-action:latest' + uses: 'docker://zmkfirmware/zephyr-west-action:latest' id: west-init with: args: "'init' '-l app'" From 44ebcb8fa456e21945b10fe0f6e7e6566e47864d Mon Sep 17 00:00:00 2001 From: Pete Johanson Date: Fri, 12 Jun 2020 16:48:06 -0400 Subject: [PATCH 5/8] Try fixing args passed to container. --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4271daa9..ced0726f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -30,7 +30,7 @@ jobs: uses: 'docker://zmkfirmware/zephyr-west-action:latest' id: west-init with: - args: "'init' '-l app'" + args: "init -l app" - name: West Update uses: zmkfirmware/zephyr-west-action@v0.1.0 id: west-update From 2ce8961aba93e76a204e16ee9f2cf31d9a3a09bb Mon Sep 17 00:00:00 2001 From: Pete Johanson Date: Fri, 12 Jun 2020 16:54:23 -0400 Subject: [PATCH 6/8] Switch to ARM only, use everywhere. --- .github/workflows/build.yml | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ced0726f..ef415ac2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -27,7 +27,7 @@ jobs: ${{ runner.os }}-build- ${{ runner.os }}- - name: West Init - uses: 'docker://zmkfirmware/zephyr-west-action:latest' + uses: 'docker://zmkfirmware/zephyr-west-action-arm:latest' id: west-init with: args: "init -l app" @@ -35,21 +35,19 @@ jobs: uses: zmkfirmware/zephyr-west-action@v0.1.0 id: west-update with: - command: 'update' + args: 'update' - name: West Config Zephyr Base - uses: zmkfirmware/zephyr-west-action@v0.1.0 + uses: 'docker://zmkfirmware/zephyr-west-action-arm:latest' id: west-config with: - command: 'config' - command-args: '--global zephyr.base-prefer configfile' + args: 'config --global zephyr.base-prefer configfile' - name: West Zephyr Export - uses: zmkfirmware/zephyr-west-action@v0.1.0 + uses: 'docker://zmkfirmware/zephyr-west-action-arm:latest' id: west-zephyr-export with: - command: 'zephyr-export' + args: 'zephyr-export' - name: West Build - uses: zmkfirmware/zephyr-west-action@v0.1.0 + uses: 'docker://zmkfirmware/zephyr-west-action-arm:latest' id: west-build with: - command: 'build' - command-args: '-s app -b proton_c -- -DSHIELD=petejohanson_proton_handwire' + args: 'build -s app -b proton_c -- -DSHIELD=petejohanson_proton_handwire' From 5defe0a771002e598328248cbbf1b85dd3d0f369 Mon Sep 17 00:00:00 2001 From: Pete Johanson Date: Fri, 12 Jun 2020 16:57:14 -0400 Subject: [PATCH 7/8] One missing action reference. --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ef415ac2..d36b0da2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -32,7 +32,7 @@ jobs: with: args: "init -l app" - name: West Update - uses: zmkfirmware/zephyr-west-action@v0.1.0 + uses: 'docker://zmkfirmware/zephyr-west-action-arm:latest' id: west-update with: args: 'update' From c4082bd31e44b09d4758a502720082da8a7c79cc Mon Sep 17 00:00:00 2001 From: Pete Johanson Date: Fri, 12 Jun 2020 17:00:14 -0400 Subject: [PATCH 8/8] Try to fix some quoting. --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d36b0da2..11b9f390 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -30,7 +30,7 @@ jobs: uses: 'docker://zmkfirmware/zephyr-west-action-arm:latest' id: west-init with: - args: "init -l app" + args: 'init "-l app"' - name: West Update uses: 'docker://zmkfirmware/zephyr-west-action-arm:latest' id: west-update @@ -40,7 +40,7 @@ jobs: uses: 'docker://zmkfirmware/zephyr-west-action-arm:latest' id: west-config with: - args: 'config --global zephyr.base-prefer configfile' + args: 'config "--global zephyr.base-prefer configfile"' - name: West Zephyr Export uses: 'docker://zmkfirmware/zephyr-west-action-arm:latest' id: west-zephyr-export @@ -50,4 +50,4 @@ jobs: uses: 'docker://zmkfirmware/zephyr-west-action-arm:latest' id: west-build with: - args: 'build -s app -b proton_c -- -DSHIELD=petejohanson_proton_handwire' + args: 'build "-s app -b proton_c -- -DSHIELD=petejohanson_proton_handwire"'