Skip to content

Commit fe90b4f

Browse files
authored
Gnls (#94)
* Initial work * More * Update hashes and fix paths * Progress on go GNLS tests * gnls: tests passing with 20 repeats * gnls: remove notebook_suffix * Also remove header_lines * Update go-parser.nix hash * ci: try testing aarch64-linux * ci: update names * ci: another fix
1 parent f253979 commit fe90b4f

3 files changed

Lines changed: 24 additions & 12 deletions

File tree

.github/workflows/ci.yml

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -44,44 +44,52 @@ jobs:
4444
run: nix flake check
4545

4646
build-ui-metadata:
47-
name: "build-ui-metadata (${{matrix.runs-on}})"
47+
name: "build-ui-metadata (${{matrix.runs-on.os}}, ${{matrix.runs-on.arch}})"
4848
runs-on:
4949
- self-hosted
50-
- ${{matrix.runs-on}}
50+
- ${{matrix.runs-on.os}}
5151
strategy:
5252
fail-fast: false
5353
matrix:
5454
runs-on:
55-
- macOS
56-
- Linux
55+
- os: macOS
56+
arch: aarch64-darwin
57+
- os: Linux
58+
arch: x86_64-linux
59+
- os: Linux
60+
arch: aarch64-linux
5761

5862
steps:
5963
- uses: actions/checkout@v4
6064

6165
- name: Build .#ui_metadata_farm
6266
if: "!contains(github.event.head_commit.message, 'noci')"
6367
run: |
64-
nix build .#ui_metadata_farm
68+
nix build .#packages.${{matrix.runs-on.arch}}.ui_metadata_farm
6569
6670
build-sample-environments:
67-
name: "build-sample-environments (${{matrix.runs-on}})"
71+
name: "build-sample-environments (${{matrix.runs-on.os}}, ${{matrix.runs-on.arch}})"
6872
runs-on:
6973
- self-hosted
70-
- ${{matrix.runs-on}}
74+
- ${{matrix.runs-on.os}}
7175
strategy:
7276
fail-fast: false
7377
matrix:
7478
runs-on:
75-
- macOS
76-
- Linux
79+
- os: macOS
80+
arch: aarch64-darwin
81+
- os: Linux
82+
arch: x86_64-linux
83+
- os: Linux
84+
arch: aarch64-linux
7785

7886
steps:
7987
- uses: actions/checkout@v4
8088

8189
- name: Build .#sample_environments_farm
8290
if: "!contains(github.event.head_commit.message, 'noci')"
8391
run: |
84-
nix build .#sample_environments_farm
92+
nix build .#packages.${{matrix.runs-on.arch}}.sample_environments_farm
8593
8694
test:
8795
name: ${{ matrix.suite.name }} (${{ matrix.runs-on }}${{ matrix.suite.flags && format(', {0}', matrix.suite.flags) || '' }})

modules/kernels/go/language-server-gopls/go-parser.nix

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,11 @@ buildGoModule rec {
1111
owner = "codedownio";
1212
repo = "go-notebook-language-server";
1313
rev = "v${version}";
14+
<<<<<<< gnls
15+
hash = "sha256-bOh7LbPxs+olEGKrNnnoq6xMhoRRSeZCV6GgJ7CUPyk=";
16+
=======
1417
hash = "sha256-SdN/v4psQRQ8O+3BosYgcZzBZSxNytVmw1A/lM2fQ/4=";
18+
>>>>>>> main
1519
};
1620

1721
sourceRoot = "${src.name}/go-parser";

modules/kernels/go/language-server-gopls/language-server-gopls.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@ common.writeTextDirWithMetaAndPassthru gopls.meta passthru "lib/codedown/languag
5353
description = gopls.meta.description;
5454
icon = ../go-logo-64x64.png;
5555
extensions = ["go"];
56-
notebook_suffix = ".go";
56+
notebook_suffix = "";
5757
kernel_name = kernelName;
58-
header_lines = ["package Notebook"];
58+
header_lines = [];
5959
attrs = attrs;
6060
type = "stream";
6161
args = [

0 commit comments

Comments
 (0)