Skip to content

Commit

Permalink
Merge branch 'main' into activate-interop-2025
Browse files Browse the repository at this point in the history
  • Loading branch information
DanielRyanSmith authored Feb 11, 2025
2 parents b70d7f9 + 8d409a2 commit 8201c8e
Show file tree
Hide file tree
Showing 47 changed files with 264 additions and 278 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# vim: set expandtab sw=4
FROM golang:1.22.11-bookworm
FROM golang:1.23.6-bookworm

# Create a non-priviledged user to run browsers as (Firefox and Chrome do not
# like to run as root).
Expand Down
4 changes: 3 additions & 1 deletion api/checks/api.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"net/url"
"time"

"github.com/google/go-github/v65/github"
"github.com/google/go-github/v69/github"
"github.com/web-platform-tests/wpt.fyi/api/checks/summaries"
"github.com/web-platform-tests/wpt.fyi/shared"
)
Expand Down Expand Up @@ -97,6 +97,7 @@ func (s checksAPIImpl) IgnoreFailure(
// somebody ignored the failure.
output := run.GetOutput()
if output == nil {
// nolint:exhaustruct // TODO: Fix exhaustruct lint error.
output = &github.CheckRunOutput{}
}
prepend := fmt.Sprintf("This check was marked as a success by @%s via the _Ignore_ action.\n\n", sender)
Expand Down Expand Up @@ -136,6 +137,7 @@ func (s checksAPIImpl) CancelRun(
// somebody ignored the failure.
summary := fmt.Sprintf("This check was cancelled by @%s via the _Cancel_ action.", sender)
title := run.GetOutput().GetTitle()
// nolint:exhaustruct // TODO: Fix exhaustruct lint error.
output := &github.CheckRunOutput{
Title: &title,
Summary: &summary,
Expand Down
2 changes: 1 addition & 1 deletion api/checks/jwt.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
"time"

jwt "github.com/golang-jwt/jwt"
"github.com/google/go-github/v65/github"
"github.com/google/go-github/v69/github"
"github.com/web-platform-tests/wpt.fyi/shared"
"golang.org/x/oauth2"
)
Expand Down
2 changes: 1 addition & 1 deletion api/checks/mock_checks/api_mock.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion api/checks/runs.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"fmt"
"time"

"github.com/google/go-github/v65/github"
"github.com/google/go-github/v69/github"
"github.com/web-platform-tests/wpt.fyi/api/checks/summaries"
"github.com/web-platform-tests/wpt.fyi/shared"
)
Expand Down Expand Up @@ -100,7 +100,9 @@ func getExistingCheckRuns(ctx context.Context, suite shared.CheckSuite) ([]*gith
}

var runs []*github.CheckRun
// nolint:exhaustruct // TODO: Fix exhaustruct lint error.
options := github.ListCheckRunsOptions{
// nolint:exhaustruct // TODO: Fix exhaustruct lint error.
ListOptions: github.ListOptions{
// 100 is the maximum allowed items per page; see
// https://developer.github.com/v3/guides/traversing-with-pagination/#changing-the-number-of-items-received
Expand Down
2 changes: 1 addition & 1 deletion api/checks/summaries/actions.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

package summaries

import "github.com/google/go-github/v65/github"
import "github.com/google/go-github/v69/github"

// RecomputeAction is an action that can be taken to
// trigger a recompute of the diff, against the latest
Expand Down
2 changes: 1 addition & 1 deletion api/checks/summaries/actions_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ package summaries
import (
"testing"

"github.com/google/go-github/v65/github"
"github.com/google/go-github/v69/github"
"github.com/stretchr/testify/assert"
)

Expand Down
2 changes: 1 addition & 1 deletion api/checks/summaries/compile.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (

mapset "github.com/deckarep/golang-set"

"github.com/google/go-github/v65/github"
"github.com/google/go-github/v69/github"
"github.com/web-platform-tests/wpt.fyi/shared"
)

Expand Down
2 changes: 1 addition & 1 deletion api/checks/summaries/completed.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
package summaries

import (
"github.com/google/go-github/v65/github"
"github.com/google/go-github/v69/github"
"github.com/web-platform-tests/wpt.fyi/shared"
)

Expand Down
2 changes: 1 addition & 1 deletion api/checks/summaries/pending.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

package summaries

import "github.com/google/go-github/v65/github"
import "github.com/google/go-github/v69/github"

// Pending is the struct for pending.md.
type Pending struct {
Expand Down
2 changes: 1 addition & 1 deletion api/checks/summaries/regressed.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
package summaries

import (
"github.com/google/go-github/v65/github"
"github.com/google/go-github/v69/github"
"github.com/web-platform-tests/wpt.fyi/shared"
)

Expand Down
2 changes: 1 addition & 1 deletion api/checks/webhook.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"net/http"
"regexp"

"github.com/google/go-github/v65/github"
"github.com/google/go-github/v69/github"
"github.com/web-platform-tests/wpt.fyi/shared"
)

Expand Down
2 changes: 1 addition & 1 deletion api/checks/webhook_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"strings"
"testing"

"github.com/google/go-github/v65/github"
"github.com/google/go-github/v69/github"
"github.com/stretchr/testify/assert"
"github.com/web-platform-tests/wpt.fyi/api/checks/mock_checks"
"github.com/web-platform-tests/wpt.fyi/shared"
Expand Down
3 changes: 2 additions & 1 deletion api/ghactions/notify.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (

mapset "github.com/deckarep/golang-set"
"github.com/gobwas/glob"
"github.com/google/go-github/v65/github"
"github.com/google/go-github/v69/github"
uc "github.com/web-platform-tests/wpt.fyi/api/receiver/client"

"github.com/web-platform-tests/wpt.fyi/shared"
Expand Down Expand Up @@ -108,6 +108,7 @@ func processBuild(
return false, err
}

// nolint:exhaustruct // TODO: Fix exhaustruct lint error.
opts := &github.ListOptions{PerPage: 100}

archiveURLs := []string{}
Expand Down
2 changes: 1 addition & 1 deletion api/ghactions/notify_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ package ghactions
import (
"testing"

"github.com/google/go-github/v65/github"
"github.com/google/go-github/v69/github"
"github.com/stretchr/testify/assert"
)

Expand Down
2 changes: 1 addition & 1 deletion api/manifest/api.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"regexp"
"time"

"github.com/google/go-github/v65/github"
"github.com/google/go-github/v69/github"
"github.com/web-platform-tests/wpt.fyi/shared"
)

Expand Down
2 changes: 1 addition & 1 deletion api/metadata_cache.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"net/http"
"time"

"github.com/google/go-github/v65/github"
"github.com/google/go-github/v69/github"
"github.com/web-platform-tests/wpt.fyi/shared"
)

Expand Down
2 changes: 1 addition & 1 deletion api/query/cache/poll/poll.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"strconv"
"time"

"github.com/google/go-github/v65/github"
"github.com/google/go-github/v69/github"
"github.com/web-platform-tests/wpt.fyi/api/query"
"github.com/web-platform-tests/wpt.fyi/api/query/cache/index"
"github.com/web-platform-tests/wpt.fyi/shared"
Expand Down
2 changes: 1 addition & 1 deletion api/query/cache/service/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Production deployment spec for query cache service.

FROM golang:1.22.11-bookworm as builder
FROM golang:1.23.6-bookworm as builder

RUN apt-get update
RUN apt-get install -qy --no-install-suggests git
Expand Down
2 changes: 1 addition & 1 deletion api/receiver/mock_receiver/api_mock.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion api/taskcluster/mock_taskcluster/webhook_mock.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 4 additions & 2 deletions api/taskcluster/webhook.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ import (
"sync"

mapset "github.com/deckarep/golang-set"
"github.com/google/go-github/v65/github"
"github.com/google/go-github/v69/github"
tcurls "github.com/taskcluster/taskcluster-lib-urls"
"github.com/taskcluster/taskcluster/v67/clients/client-go/tcqueue"
"github.com/taskcluster/taskcluster/v80/clients/client-go/tcqueue"
uc "github.com/web-platform-tests/wpt.fyi/api/receiver/client"
"github.com/web-platform-tests/wpt.fyi/shared"
)
Expand Down Expand Up @@ -471,7 +471,9 @@ func (api apiImpl) GetTaskGroupInfo(rootURL string, groupID string) (*TaskGroupI

func (api apiImpl) ListCheckRuns(owner string, repo string, checkSuiteID int64) ([]*github.CheckRun, error) {
var runs []*github.CheckRun
// nolint:exhaustruct // TODO: Fix exhaustruct lint error.
options := github.ListCheckRunsOptions{
// nolint:exhaustruct // TODO: Fix exhaustruct lint error.
ListOptions: github.ListOptions{
// 100 is the maximum allowed items per page[0], but due to
// https://github.com/web-platform-tests/wpt/issues/27243 we
Expand Down
2 changes: 1 addition & 1 deletion api/taskcluster/webhook_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"testing"
"time"

"github.com/google/go-github/v65/github"
"github.com/google/go-github/v69/github"
"github.com/stretchr/testify/assert"
uc "github.com/web-platform-tests/wpt.fyi/api/receiver/client"
tc "github.com/web-platform-tests/wpt.fyi/api/taskcluster"
Expand Down
67 changes: 32 additions & 35 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
module github.com/web-platform-tests/wpt.fyi

go 1.22.7

toolchain go1.22.9
go 1.23.6

require (
cloud.google.com/go/cloudtasks v1.13.3
Expand All @@ -15,7 +13,7 @@ require (
github.com/gobwas/glob v0.2.3
github.com/golang-jwt/jwt v3.2.2+incompatible
github.com/gomodule/redigo v1.9.2
github.com/google/go-github/v65 v65.0.0
github.com/google/go-github/v69 v69.0.0
github.com/google/uuid v1.6.0
github.com/gorilla/handlers v1.5.2
github.com/gorilla/mux v1.8.1
Expand All @@ -25,40 +23,39 @@ require (
github.com/sirupsen/logrus v1.9.3
github.com/stretchr/testify v1.10.0
github.com/taskcluster/taskcluster-lib-urls v13.0.1+incompatible
github.com/taskcluster/taskcluster/v67 v67.1.0
github.com/taskcluster/taskcluster/v80 v80.0.0
github.com/tebeka/selenium v0.9.9
go.uber.org/mock v0.5.0
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616
golang.org/x/oauth2 v0.25.0
google.golang.org/api v0.219.0
google.golang.org/genproto v0.0.0-20250122153221-138b5a5a4fd4
google.golang.org/genproto/googleapis/api v0.0.0-20250124145028-65684f501c47
golang.org/x/lint v0.0.0-20241112194109-818c5a804067
golang.org/x/oauth2 v0.26.0
google.golang.org/api v0.220.0
google.golang.org/genproto v0.0.0-20250207221924-e9438ea467c6
google.golang.org/genproto/googleapis/api v0.0.0-20250207221924-e9438ea467c6
google.golang.org/grpc v1.70.0
gopkg.in/yaml.v3 v3.0.1
)

require (
cel.dev/expr v0.19.0 // indirect
cloud.google.com/go v0.118.0 // indirect
cloud.google.com/go/auth v0.14.0 // indirect
cel.dev/expr v0.19.2 // indirect
cloud.google.com/go v0.118.2 // indirect
cloud.google.com/go/auth v0.14.1 // indirect
cloud.google.com/go/auth/oauth2adapt v0.2.7 // indirect
cloud.google.com/go/compute/metadata v0.6.0 // indirect
cloud.google.com/go/iam v1.3.1 // indirect
cloud.google.com/go/longrunning v0.6.4 // indirect
cloud.google.com/go/monitoring v1.23.0 // indirect
cloud.google.com/go/monitoring v1.24.0 // indirect
github.com/BurntSushi/xgb v0.0.0-20200324125942-20f126ea2843 // indirect
github.com/BurntSushi/xgbutil v0.0.0-20190907113008-ad855c713046 // indirect
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.25.0 // indirect
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.48.1 // indirect
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.48.1 // indirect
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.26.0 // indirect
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.50.0 // indirect
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.50.0 // indirect
github.com/blang/semver v3.5.1+incompatible // indirect
github.com/cenkalti/backoff/v3 v3.2.2 // indirect
github.com/census-instrumentation/opencensus-proto v0.4.1 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/cncf/xds/go v0.0.0-20240905190251-b4127c9b8d78 // indirect
github.com/cncf/xds/go v0.0.0-20250121191232-2f005788dc42 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/envoyproxy/go-control-plane v0.13.1 // indirect
github.com/envoyproxy/protoc-gen-validate v1.1.0 // indirect
github.com/envoyproxy/go-control-plane/envoy v1.32.4 // indirect
github.com/envoyproxy/protoc-gen-validate v1.2.1 // indirect
github.com/fatih/camelcase v1.0.0 // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/go-logr/logr v1.4.2 // indirect
Expand All @@ -76,24 +73,24 @@ require (
github.com/taskcluster/slugid-go v1.1.0 // indirect
github.com/tent/hawk-go v0.0.0-20161026210932-d341ea318957 // indirect
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
go.opentelemetry.io/contrib/detectors/gcp v1.32.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.58.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 // indirect
go.opentelemetry.io/contrib/detectors/gcp v1.34.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.59.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0 // indirect
go.opentelemetry.io/otel v1.34.0 // indirect
go.opentelemetry.io/otel/metric v1.34.0 // indirect
go.opentelemetry.io/otel/sdk v1.34.0 // indirect
go.opentelemetry.io/otel/sdk/metric v1.32.0 // indirect
go.opentelemetry.io/otel/sdk/metric v1.34.0 // indirect
go.opentelemetry.io/otel/trace v1.34.0 // indirect
golang.org/x/crypto v0.32.0 // indirect
golang.org/x/mod v0.21.0 // indirect
golang.org/x/net v0.34.0 // indirect
golang.org/x/sync v0.10.0 // indirect
golang.org/x/sys v0.29.0 // indirect
golang.org/x/text v0.21.0 // indirect
golang.org/x/time v0.9.0 // indirect
golang.org/x/tools v0.25.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20250124145028-65684f501c47 // indirect
google.golang.org/protobuf v1.36.4 // indirect
golang.org/x/crypto v0.33.0 // indirect
golang.org/x/mod v0.23.0 // indirect
golang.org/x/net v0.35.0 // indirect
golang.org/x/sync v0.11.0 // indirect
golang.org/x/sys v0.30.0 // indirect
golang.org/x/text v0.22.0 // indirect
golang.org/x/time v0.10.0 // indirect
golang.org/x/tools v0.30.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20250207221924-e9438ea467c6 // indirect
google.golang.org/protobuf v1.36.5 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
)

Expand Down
Loading

0 comments on commit 8201c8e

Please sign in to comment.