Skip to content

Commit dbe2f19

Browse files
committed
actions: update deprecated actions
1 parent ac3101e commit dbe2f19

File tree

4 files changed

+13
-7
lines changed

4 files changed

+13
-7
lines changed

.github/actions/Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,5 @@ COPY entrypoint.sh /entrypoint.sh
44
ENTRYPOINT ["/entrypoint.sh"]
55

66
# NOTE: When building locally (from this directory):
7-
# pushd ../../../qmk_base_container && docker build -t "qmkfm/base_container:latest" . ; popd
8-
# pushd ../../../qmk_cli && docker build -t "qmkfm/qmk_cli:latest" . ; popd
7+
# docker pull docker.io/qmkfm/qmk_cli
98
# docker build -t "nullbitsco/firmware:latest" . && docker run nullbitsco/firmware

.github/actions/entrypoint.sh

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,20 @@ cd holly || exit 1
3636
append_githash_info
3737
cd ../
3838

39+
# Set up QMK
3940
qmk setup -y
4041

42+
# Add VIA userspace (must be done after QMK setup)
43+
cd / || exit 1
44+
git clone https://github.com/the-via/qmk_userspace_via
45+
qmk config user.overlay_dir="$(realpath qmk_userspace_via)"
46+
cd -
47+
4148
# Compile upstream boards first
4249
qmk mass-compile -j "$(nproc)" \
4350
nullbitsco/nibble:all nullbitsco/tidbit:all \
4451
nullbitsco/scramble/v1:all nullbitsco/scramble/v2:all \
45-
nullbitsco/snap:all nullbitsco/holly:all
52+
nullbitsco/snap:all nullbitsco/holly:via
4653

4754
# Checkout nullbits rp2040 repo
4855
git config advice.detachedHead false

.github/workflows/build-fw.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ jobs:
1616
name: Build firmware
1717
steps:
1818
- name: Check out repository
19-
uses: actions/checkout@v2
19+
uses: actions/checkout@v4
2020
- name: Build in docker container
2121
id: docker_build
2222
uses: ./.github/actions/
2323
- name: Archive artifacts
24-
uses: actions/upload-artifact@v2
24+
uses: actions/upload-artifact@v4
2525
with:
2626
name: precompiled-firmware-files
2727
path: |

.github/workflows/release-fw.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ jobs:
1313
name: Build firmware
1414
steps:
1515
- name: Check out repository
16-
uses: actions/checkout@v2
16+
uses: actions/checkout@v4
1717
- name: Build in docker container
1818
id: docker_build
1919
uses: ./.github/actions/
2020
- name: Archive artifacts
21-
uses: actions/upload-artifact@v2
21+
uses: actions/upload-artifact@v4
2222
with:
2323
name: precompiled-firmware-files
2424
path: |

0 commit comments

Comments
 (0)