Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .github/actions/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,5 @@ COPY entrypoint.sh /entrypoint.sh
ENTRYPOINT ["/entrypoint.sh"]

# NOTE: When building locally (from this directory):
# pushd ../../../qmk_base_container && docker build -t "qmkfm/base_container:latest" . ; popd
# pushd ../../../qmk_cli && docker build -t "qmkfm/qmk_cli:latest" . ; popd
# docker pull docker.io/qmkfm/qmk_cli
# docker build -t "nullbitsco/firmware:latest" . && docker run nullbitsco/firmware
9 changes: 8 additions & 1 deletion .github/actions/entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,20 @@ cd holly || exit 1
append_githash_info
cd ../

# Set up QMK
qmk setup -y

# Add VIA userspace (must be done after QMK setup)
cd / || exit 1
git clone https://github.com/the-via/qmk_userspace_via
qmk config user.overlay_dir="$(realpath qmk_userspace_via)"
cd -

# Compile upstream boards first
qmk mass-compile -j "$(nproc)" \
nullbitsco/nibble:all nullbitsco/tidbit:all \
nullbitsco/scramble/v1:all nullbitsco/scramble/v2:all \
nullbitsco/snap:all nullbitsco/holly:all
nullbitsco/snap:all nullbitsco/holly:via

# Checkout nullbits rp2040 repo
git config advice.detachedHead false
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build-fw.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ jobs:
name: Build firmware
steps:
- name: Check out repository
uses: actions/checkout@v2
uses: actions/checkout@v4
- name: Build in docker container
id: docker_build
uses: ./.github/actions/
- name: Archive artifacts
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: precompiled-firmware-files
path: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release-fw.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ jobs:
name: Build firmware
steps:
- name: Check out repository
uses: actions/checkout@v2
uses: actions/checkout@v4
- name: Build in docker container
id: docker_build
uses: ./.github/actions/
- name: Archive artifacts
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: precompiled-firmware-files
path: |
Expand Down