Skip to content

Commit

Permalink
chore: actions updates, cleanup, debugging
Browse files Browse the repository at this point in the history
  • Loading branch information
minusfive committed Oct 10, 2024
1 parent 8d2030e commit 34133e9
Show file tree
Hide file tree
Showing 9 changed files with 205 additions and 1,576 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Setup Pages
uses: actions/configure-pages@v3
uses: actions/configure-pages@v5
- name: Upload artifact
uses: actions/upload-pages-artifact@v2
uses: actions/upload-pages-artifact@v3
with:
path: "img/"
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v2
uses: actions/deploy-pages@v4
15 changes: 8 additions & 7 deletions .github/workflows/draw.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,11 @@ on:
workflow_dispatch: # can be triggered manually
push:
paths:
- "config/*.keymap"
- "config/corneish_zen.keymap"
- "config/*.dtsi"
- "knucklehead/*.dtsi"
- "keymap_drawer.config.yaml"
- "keymap-drawer/config.yaml"
- ".github/workflows/draw.yml"

# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
Expand All @@ -18,14 +19,14 @@ concurrency:

jobs:
draw:
uses: minusfive/keymap-drawer/.github/workflows/draw-zmk.yml@main
uses: caksoylar/keymap-drawer/.github/workflows/draw-zmk.yml@main
permissions:
contents: write
with:
install_branch: "main" # branch to install keymap-drawer from
keymap_patterns: "config/*.keymap" # path to the keymaps to parse
config_path: "keymap_drawer.config.yaml" # config file, ignored if not exists
output_folder: "img" # path to save produced SVGs
keymap_patterns: "config/corneish_zen.keymap" # path to the keymaps to parse
config_path: "keymap-drawer/config.yaml" # config file, ignored if it doesn't exist
output_folder: "keymap-drawer" # path to save produced SVGs
# commit_message: "Draw: ${{ github.event.head_commit.message }}"
amend_commit: true # whether to amend the commit or create a new one

fail_on_error: true
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ modules/
tools/
.west/
.DS_Store
.venv/
1,237 changes: 0 additions & 1,237 deletions img/corne.svg

This file was deleted.

203 changes: 0 additions & 203 deletions img/corne.yaml

This file was deleted.

12 changes: 9 additions & 3 deletions keymap_drawer.config.yaml → keymap-drawer/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -281,6 +281,7 @@ draw_config:
.hold {
dominant-baseline: ideographic;
fill: var(--color--key--text--hold);
translate: -25px 4px;
}
/*
Expand Down Expand Up @@ -311,7 +312,7 @@ draw_config:
}
.combo.hold {
font-size: 16px;
/* translate: 2px 0px; */
translate: 0 0;
}
/*
Expand Down Expand Up @@ -462,6 +463,10 @@ parse_config:
tap: $$mdi:backup-restore$$
"&bootloader":
tap: $$mdi:progress-download$$
"&rst_boot 0 0":
type: bootloader
tap: $$mdi:backup-restore$$
hold: $$mdi:progress-download$$

# ZMK
zmk_keycode_map:
Expand Down Expand Up @@ -608,14 +613,15 @@ parse_config:
RSHIFT: $$mdi:apple-keyboard-shift$$
RSHFT: $$mdi:apple-keyboard-shift$$
RCMD: $$mdi:apple-keyboard-command$$
# "Meh" key
LS(LC(LALT)): $$mdi:star-three-points$$
LS(LC(LALT)): $$mdi:triangle$$ # Meh

# Arrows
UP: $$mdi:arrow-up-bold$$
DOWN: $$mdi:arrow-down-bold$$
LEFT: $$mdi:arrow-left-bold$$
RIGHT: $$mdi:arrow-right-bold$$
PG_UP: $$mdi:transfer-up$$
PG_DN: $$mdi:transfer-down$$

# Whitespace
ENTER:
Expand Down
Loading

0 comments on commit 34133e9

Please sign in to comment.