From c293def76b2b8756190db539fa887b2e820c6d3a Mon Sep 17 00:00:00 2001 From: kB01 Date: Mon, 16 Oct 2023 00:17:13 +0200 Subject: [PATCH] Changed Build Pipeline to support submodules --- .github/workflows/build.yml | 2 +- .gitmodules | 4 ++-- config/corne.keymap | 6 +++--- config/zmk-nodefree-config => zmk-nodefree-config | 0 4 files changed, 6 insertions(+), 6 deletions(-) rename config/zmk-nodefree-config => zmk-nodefree-config (100%) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d74fb89..2ba738f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -2,4 +2,4 @@ on: [push, pull_request, workflow_dispatch] jobs: build: - uses: zmkfirmware/zmk/.github/workflows/build-user-config.yml@main + uses: urob/zmk/.github/workflows/build-user-config.yml@build-with-submodules diff --git a/.gitmodules b/.gitmodules index c9c89d3..314a3c9 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ -[submodule "config/zmk-nodefree-config"] - path = config/zmk-nodefree-config +[submodule "zmk-nodefree-config"] + path = zmk-nodefree-config url = https://github.com/urob/zmk-nodefree-config diff --git a/config/corne.keymap b/config/corne.keymap index 8074943..c0f2c50 100644 --- a/config/corne.keymap +++ b/config/corne.keymap @@ -8,9 +8,9 @@ #include #include -#include "./zmk-nodefree-config/helper.h" -#include "./zmk-nodefree-config/keypos_def/keypos_42keys.h" -#include "./zmk-nodefree-config/international_chars/german.dtsi" +#include "../zmk-nodefree-config/helper.h" +#include "../zmk-nodefree-config/keypos_def/keypos_42keys.h" +#include "../zmk-nodefree-config/international_chars/german.dtsi" / { keymap { diff --git a/config/zmk-nodefree-config b/zmk-nodefree-config similarity index 100% rename from config/zmk-nodefree-config rename to zmk-nodefree-config