Skip to content

Commit 18b078a

Browse files
authored
Merge branch 'main' into lsp-colors-codemirrror
2 parents c2038bb + 7356af5 commit 18b078a

File tree

8 files changed

+2344
-332
lines changed

8 files changed

+2344
-332
lines changed

.github/workflows/generate-website-docs.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,15 @@ jobs:
4040
# cleanup old
4141
rm -rf documentation/content/pages/docs/kcl/*.md
4242
rm -rf documentation/content/pages/docs/kcl/types
43-
rm -rf documentation/content/pages/docs/kcl/settings
43+
rm -rf documentation/content/pages/docs/kcl/functions
4444
rm -rf documentation/content/pages/docs/kcl/consts
4545
# move new
4646
mv -f docs/kcl/*.md documentation/content/pages/docs/kcl/
4747
mv -f docs/kcl/types documentation/content/pages/docs/kcl/
48-
mv -f docs/kcl/settings documentation/content/pages/docs/kcl/
48+
mv -f docs/kcl/functions documentation/content/pages/docs/kcl/
4949
mv -f docs/kcl/consts documentation/content/pages/docs/kcl/
50+
# We don't need the README
51+
rm documentation/content/pages/docs/kcl/README.md
5052
- name: move kcl-samples
5153
shell: bash
5254
run: |

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,3 +85,4 @@ venv
8585

8686
.vscode-test
8787
.biome/
88+
.million

flake.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171

7272
TARGET_CC = "${pkgs.stdenv.cc}/bin/${pkgs.stdenv.cc.targetPrefix}cc";
7373
LIBCLANG_PATH = "${pkgs.libclang.lib}/lib";
74-
ELECTRON_OVERRIDE_DIST_PATH = "${pkgs.electron}/bin/";
74+
ELECTRON_OVERRIDE_DIST_PATH = if pkgs.stdenv.isDarwin then "${pkgs.electron}/Applications" else "${pkgs.electron}/bin";
7575
PLAYWRIGHT_SKIP_VALIDATE_HOST_REQUIREMENTS = true;
7676
PLAYWRIGHT_CHROMIUM_EXECUTABLE_PATH = "${pkgs.playwright-driver.browsers}/chromium-1091/chrome-linux/chrome";
7777
PLAYWRIGHT_BROWSERS_PATH = "${pkgs.playwright-driver.browsers}";

0 commit comments

Comments
 (0)