From 1bf931aad2ec54c7d50698ac8b3342d6542d8afc Mon Sep 17 00:00:00 2001
From: Peter Johanson <peter@peterjohanson.com>
Date: Fri, 5 Nov 2021 15:15:21 -0400
Subject: [PATCH] TEMPORARY: Bump to 2.7 docker images.

---
 .devcontainer/Dockerfile                           |  2 +-
 .github/workflows/build.yml                        |  2 +-
 .github/workflows/hardware-metadata-validation.yml |  2 +-
 .github/workflows/test.yml                         |  2 +-
 app/west.yml                                       | 10 ++++------
 5 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 7aed4880..29a9ac21 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -1,4 +1,4 @@
-FROM docker.io/zmkfirmware/zmk-dev-arm:2.5
+FROM docker.io/petejohanson/zmk-dev-arm:2.7-branch
 
 COPY .bashrc tmp
 RUN mv /tmp/.bashrc ~/.bashrc
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b790b665..d0c795d4 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -14,7 +14,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     container:
-      image: docker.io/zmkfirmware/zmk-build-arm:2.5
+      image: docker.io/petejohanson/zmk-build-arm:2.7-branch
     strategy:
       matrix:
         board:
diff --git a/.github/workflows/hardware-metadata-validation.yml b/.github/workflows/hardware-metadata-validation.yml
index 5c2fd375..b8921444 100644
--- a/.github/workflows/hardware-metadata-validation.yml
+++ b/.github/workflows/hardware-metadata-validation.yml
@@ -29,7 +29,7 @@ jobs:
   validate-metadata:
     runs-on: ubuntu-latest
     container:
-      image: docker.io/zmkfirmware/zmk-dev-arm:2.5
+      image: docker.io/petejohanson/zmk-dev-arm:2.7-branch
     steps:
       - uses: actions/checkout@v2
       - name: Install dependencies
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index e8cdcedf..7096383e 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -16,7 +16,7 @@ jobs:
   integration_test:
     runs-on: ubuntu-latest
     container:
-      image: docker.io/zmkfirmware/zmk-build-arm:2.5
+      image: docker.io/petejohanson/zmk-build-arm:2.7-branch
     steps:
       - name: Checkout
         uses: actions/checkout@v2
diff --git a/app/west.yml b/app/west.yml
index cab02a5a..6a566239 100644
--- a/app/west.yml
+++ b/app/west.yml
@@ -4,12 +4,14 @@ manifest:
       url-base: https://github.com/zephyrproject-rtos
     - name: zmkfirmware
       url-base: https://github.com/zmkfirmware
+    - name: petejohanson
+      url-base: https://github.com/petejohanson
     - name: microsoft
       url-base: https://github.com/microsoft
   projects:
     - name: zephyr
-      remote: zmkfirmware
-      revision: v2.5.0+zmk-fixes
+      remote: petejohanson
+      revision: v2.7.0+zmk-fixes
       clone-depth: 1
       import:
         # TODO: Rename once upstream offers option like `exclude` or `denylist`
@@ -33,9 +35,5 @@ manifest:
           - openthread
           - edtt
           - trusted-firmware-m
-    - name: uf2
-      remote: microsoft
-      path: tools/uf2
-      clone-depth: 1
   self:
     west-commands: scripts/west-commands.yml