Skip to content

Commit ca4a477

Browse files
committed
ci: Another attempt to fix release-please
1 parent 4be1d61 commit ca4a477

File tree

6 files changed

+15
-32
lines changed

6 files changed

+15
-32
lines changed

.github/.release-please-manifest.json

Lines changed: 0 additions & 1 deletion
This file was deleted.

.github/release-please-config.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
"$schema": "https://raw.githubusercontent.com/googleapis/release-please/main/schemas/config.json",
33
"packages": {
44
".": {
5-
"release-type": "go",
5+
"release-type": "simple",
66
"bump-minor-pre-major": true,
77
"include-v-in-tag": true,
8-
"extra-files": ["internal/app/version.go"]
8+
"initial-version": "0.0.1"
99
}
1010
}
1111
}

e2e_test.go

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,21 +24,25 @@ package main_test
2424

2525
import (
2626
"bytes"
27+
_ "embed"
2728
"fmt"
2829
"io"
2930
"os"
3031
"os/exec"
3132
"path/filepath"
3233
"strconv"
34+
"strings"
3335
"testing"
3436
"time"
3537

36-
"github.com/armsnyder/gdshader-language-server/internal/app"
3738
. "github.com/onsi/gomega"
3839

3940
"github.com/samber/lo"
4041
)
4142

43+
//go:embed version.txt
44+
var version string
45+
4246
func TestE2E(t *testing.T) {
4347
g := NewWithT(t)
4448

@@ -91,7 +95,7 @@ func TestE2E(t *testing.T) {
9195
expected += "Content-Length: " + strconv.Itoa(len(s)) + "\r\nContent-Type: application/vscode-jsonrpc; charset=utf-8\r\n\r\n" + s
9296
}
9397

94-
expect(fmt.Sprintf(`{"jsonrpc":"2.0","id":1,"result":{"capabilities":{"textDocumentSync":{"openClose":true,"change":2},"completionProvider":{}},"serverInfo":{"name":"gdshader-language-server","version":%q}}}`, app.Version))
98+
expect(fmt.Sprintf(`{"jsonrpc":"2.0","id":1,"result":{"capabilities":{"textDocumentSync":{"openClose":true,"change":2},"completionProvider":{}},"serverInfo":{"name":"gdshader-language-server","version":%q}}}`, strings.TrimSpace(version)))
9599
expect(`{"jsonrpc":"2.0","id":2,"result":null}`)
96100

97101
g.Expect(stdout.String()).To(BeComparableTo(string(expected)), "Output does not match expected")

internal/app/version.go

Lines changed: 0 additions & 26 deletions
This file was deleted.

main.go

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,20 @@
2323
package main
2424

2525
import (
26+
_ "embed"
2627
"flag"
2728
"log/slog"
2829
"os"
2930
"path/filepath"
31+
"strings"
3032

3133
"github.com/armsnyder/gdshader-language-server/internal/app"
3234
"github.com/armsnyder/gdshader-language-server/internal/lsp"
3335
)
3436

37+
//go:embed version.txt
38+
var version string
39+
3540
func main() {
3641
var flags struct {
3742
Debug bool
@@ -46,7 +51,7 @@ func main() {
4651
server := &lsp.Server{
4752
Info: lsp.ServerInfo{
4853
Name: "gdshader-language-server",
49-
Version: app.Version,
54+
Version: strings.TrimSpace(version),
5055
},
5156
Handler: &app.Handler{},
5257
}

version.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
0.0.0

0 commit comments

Comments
 (0)