Skip to content

Commit

Permalink
Bump go versions (#296)
Browse files Browse the repository at this point in the history
  • Loading branch information
fmoor committed Feb 13, 2024
1 parent 1ba36ee commit 3338bda
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
go-version: ["1.19", "1.20"]
go-version: ["1.21", "1.22"]
edgedb-version: [stable, nightly]
os: [ubuntu-latest, macos-latest]
steps:
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
quality: lint test bench

lint:
go run github.com/golangci/golangci-lint/cmd/golangci-lint@v1.53.3 run --sort-results
go run github.com/golangci/golangci-lint/cmd/golangci-lint@v1.56.1 run --sort-results

test:
go test -v -count=1 -race -bench=$$^ -timeout=20m ./...
Expand Down
3 changes: 0 additions & 3 deletions internal/client/main_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,12 @@ package edgedb

import (
"log"
"math/rand"
"os"
"testing"
"time"
)

func TestMain(m *testing.M) {
once.Do(initServer)
rand.Seed(time.Now().Unix())
log.Println("starting client tests")
os.Exit(m.Run())
}
4 changes: 2 additions & 2 deletions internal/edgedbtypes/range.go
Original file line number Diff line number Diff line change
Expand Up @@ -759,7 +759,7 @@ type OptionalRangeDateTime struct {
}

// Get returns the value and a boolean indicating if the value is present.
func (o OptionalRangeDateTime) Get() (RangeDateTime, bool) {
func (o *OptionalRangeDateTime) Get() (RangeDateTime, bool) {
return o.val, o.isSet
}

Expand All @@ -776,7 +776,7 @@ func (o *OptionalRangeDateTime) Unset() {
}

// MarshalJSON returns o marshaled as json.
func (o OptionalRangeDateTime) MarshalJSON() ([]byte, error) {
func (o *OptionalRangeDateTime) MarshalJSON() ([]byte, error) {
if o.isSet {
return json.Marshal(o.val)
}
Expand Down
4 changes: 2 additions & 2 deletions rstdocs/types.rst
Original file line number Diff line number Diff line change
Expand Up @@ -1719,7 +1719,7 @@ OptionalRangeDateTime with its value set to v.

.. code-block:: go
func (o OptionalRangeDateTime) Get() (RangeDateTime, bool)
func (o *OptionalRangeDateTime) Get() (RangeDateTime, bool)
Get returns the value and a boolean indicating if the value is present.

Expand All @@ -1731,7 +1731,7 @@ Get returns the value and a boolean indicating if the value is present.

.. code-block:: go
func (o OptionalRangeDateTime) MarshalJSON() ([]byte, error)
func (o *OptionalRangeDateTime) MarshalJSON() ([]byte, error)
MarshalJSON returns o marshaled as json.

Expand Down

0 comments on commit 3338bda

Please sign in to comment.