Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Bump Go version 1.23.0 -> 1.23.1 #128

Merged
merged 2 commits into from
Sep 6, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .tool-versions
Original file line number Diff line number Diff line change
@@ -1 +1 @@
golang 1.23.0
golang 1.23.1
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,16 @@
# <other stuff to ignore>
# And use this digest in FROM

ARG base_sha=8e529b64d382182bb84f201dea3c72118f6ae9bc01d27190ffc5a54acf0091d2
ARG base_sha=b46e8734b39f93a584eae135fc545edfdee99f1fb55c077fca908a15eb07010c

FROM golang:1.23.0@sha256:${base_sha} as builder
FROM golang:1.23.1@sha256:${base_sha} as builder

COPY . /sources
WORKDIR /sources
RUN go build -o scip-go ./cmd/scip-go

# Keep in sync with builder image
FROM golang:1.23.0@sha256:${base_sha} as final
FROM golang:1.23.1@sha256:${base_sha} as final

COPY --from=builder /sources/scip-go /usr/bin/
CMD ["scip-go"]
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/sourcegraph/scip-go

go 1.23
go 1.23.1

require (
github.com/charmbracelet/log v0.4.0
Expand Down
7 changes: 0 additions & 7 deletions internal/index/scip.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import (
_ "embed"
"fmt"
"go/ast"
"os"
"sort"
"strings"
"sync"
Expand Down Expand Up @@ -88,12 +87,6 @@ func ListMissing(opts config.IndexOpts) (missing []string, err error) {
}

func Index(writer func(proto.Message), opts config.IndexOpts) error {
if os.Getenv("GODEBUG") == "" {
// TODO: Remove this after upgrading to Go 1.23.1
// See https://github.com/golang/go/issues/68894
os.Setenv("GODEBUG", "gotypesalias=0")
}

// Emit Metadata.
// NOTE: Must be the first field emitted
writer(&scip.Metadata{
Expand Down
2 changes: 1 addition & 1 deletion internal/loader/stdlib.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// THIS FILE IS GENERATED. SEE ./scripts/gen_std_lib.sh
// Generated by: go version go1.23.0 darwin/arm64
// Generated by: go version go1.23.1 darwin/arm64
package loader

var contained = struct{}{}
Expand Down
2 changes: 1 addition & 1 deletion internal/testdata/snapshots/output/alias/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
// ^ definition github.com/sourcegraph/scip-go . `github.com/sourcegraph/scip-go/internal/testdata/snapshots/input/alias`/U#
// documentation
// > ```go
// > type U = T
// > type U struct
// > ```
// documentation
// > Check that we don't panic
Expand Down
2 changes: 1 addition & 1 deletion internal/testdata/snapshots/output/testdata/data.go
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@
// ^^^^^^^^^^^^^^^^ definition 0.1.test `sg/testdata`/TestEqualsStruct#
// documentation
// > ```go
// > type TestEqualsStruct = struct
// > type TestEqualsStruct struct
// > ```
// documentation
// > ```go
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,6 @@
// > ```go
// > func (T1).F1()
// > ```
// relationship 0.1.test `sg/testdata`/I1#F1. implementation
// relationship 0.1.test `sg/testdata`/I1#F1. implementation
// relationship 0.1.test `sg/testdata`/I1#F1. implementation

type T2 int
Expand Down Expand Up @@ -106,15 +104,13 @@
// > ```go
// > int
// > ```
// relationship 0.1.test `sg/testdata`/I1# implementation
// ^^ reference 0.1.test `sg/testdata`/T1#
type A12 = A1
// ^^^ definition 0.1.test `sg/testdata`/A12#
// documentation
// > ```go
// > int
// > ```
// relationship 0.1.test `sg/testdata`/I1# implementation
// ^^ reference 0.1.test `sg/testdata`/A1#

type InterfaceWithNonExportedMethod interface {
Expand Down
4 changes: 2 additions & 2 deletions internal/testdata/snapshots/output/testdata/typealias.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
// ^^^^^^^^^^^^ definition 0.1.test `sg/testdata`/SecretBurger#
// documentation
// > ```go
// > type SecretBurger = secret.Burger
// > type SecretBurger struct
// > ```
// documentation
// > Type aliased doc
Expand All @@ -28,7 +28,7 @@
// ^^^^^^^^^ definition 0.1.test `sg/testdata`/BadBurger#
// documentation
// > ```go
// > type BadBurger = struct
// > type BadBurger struct
// > ```
// documentation
// > ```go
Expand Down
Loading