Skip to content

Commit

Permalink
ci: Fix make git-submodule
Browse files Browse the repository at this point in the history
QMK now implements `make git-submodule` using the `qmk git-submodule`
CLI command (qmk/qmk_firmware#19479).  Move the “Update submodules” step
after the “Build the Nix shell environment” step, so that the QMK CLI is
available, and run `make git-submodule` through `nix-shell`.
  • Loading branch information
sigprof committed Mar 5, 2023
1 parent 981c744 commit 9e6bdf3
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -115,9 +115,6 @@ jobs:
ref: ${{ matrix.source.branch }}
submodules: recursive

- name: Update submodules
run: make git-submodule

- name: Configure the 'upstream' remote
run: git remote add upstream https://github.com/qmk/qmk_firmware

Expand All @@ -129,6 +126,9 @@ jobs:
id: nix_shell
run: nix-shell ../nix-devenv-qmk/shell.nix --show-trace --run 'true'

- name: Update submodules
run: nix-shell ../nix-devenv-qmk/shell.nix --run 'make git-submodule'

- name: Test 'qmk doctor'
if: ${{ always() && (steps.nix_shell.outcome == 'success') }}
run: nix-shell ../nix-devenv-qmk/shell.nix --run 'qmk doctor'
Expand Down

0 comments on commit 9e6bdf3

Please sign in to comment.