diff --git a/.github/workflows/migration.yml b/.github/workflows/migration.yml index 35a4bffb05..6d572996b2 100644 --- a/.github/workflows/migration.yml +++ b/.github/workflows/migration.yml @@ -7,8 +7,7 @@ jobs: runs-on: ubuntu-22.04 env: COMPOSE_PROJECT_NAME: ghactions - BUILD_IMAGE: mattermost/mattermost-build-server:20230118_golang-1.19.5 - TEST_IMAGE: migration-test-image + BUILD_IMAGE: mattermost/mattermost-build-server:20230904_golang-1.20.7 defaults: run: working-directory: server @@ -21,10 +20,6 @@ jobs: docker-compose --ansi never run --rm start_dependencies docker-compose --ansi never exec -T minio sh -c 'mkdir -p /data/mattermost-test'; docker-compose --ansi never ps - - name: Build test image - run: | - echo -e "FROM $BUILD_IMAGE\n\nRUN apt update && apt install -y pgloader" >> dockerfile_tmp - docker build -t $TEST_IMAGE - < dockerfile_tmp - name: Generate test-data run: | docker run --net ${COMPOSE_PROJECT_NAME}_mm-test \ @@ -34,7 +29,7 @@ jobs: -e GOCACHE=/go/cache \ -v $PWD:/mattermost \ -w /mattermost \ - $TEST_IMAGE \ + $BUILD_IMAGE \ make test-data - name: Migrate the DB and compare run: | @@ -45,7 +40,7 @@ jobs: -e GOCACHE=/go/cache \ -v $PWD:/mattermost \ -w /mattermost \ - $TEST_IMAGE \ + $BUILD_IMAGE \ make test-migration - name: Upload artifacts uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2 diff --git a/.github/workflows/mmctl-test-template.yml b/.github/workflows/mmctl-test-template.yml index d2098001f8..775ada2975 100644 --- a/.github/workflows/mmctl-test-template.yml +++ b/.github/workflows/mmctl-test-template.yml @@ -15,14 +15,14 @@ on: required: true type: string env: - go-version: "1.19.5" + go-version: "1.20.7" jobs: test: name: ${{ inputs.name }} runs-on: ubuntu-latest-8-cores env: COMPOSE_PROJECT_NAME: ghactions - BUILD_IMAGE: mattermost/mattermost-build-server:20230118_golang-1.19.5 + BUILD_IMAGE: mattermost/mattermost-build-server:20230904_golang-1.20.7 steps: - name: Checkout mattermost project uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 diff --git a/.github/workflows/server-ci-master.yml b/.github/workflows/server-ci-master.yml index 96f58e9fda..a482309afc 100644 --- a/.github/workflows/server-ci-master.yml +++ b/.github/workflows/server-ci-master.yml @@ -7,7 +7,7 @@ on: - release-* - mono-repo* env: - go-version: "1.19.5" + go-version: "1.20.7" jobs: master-ci: diff --git a/.github/workflows/server-ci-pr.yml b/.github/workflows/server-ci-pr.yml index 1028163fdf..7a51212bb5 100644 --- a/.github/workflows/server-ci-pr.yml +++ b/.github/workflows/server-ci-pr.yml @@ -6,7 +6,7 @@ on: - "e2e-tests/**" - ".github/**" env: - go-version: "1.19.5" + go-version: "1.20.7" concurrency: group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true diff --git a/.github/workflows/server-ci-template.yml b/.github/workflows/server-ci-template.yml index 6897e4f79d..e15d565aff 100644 --- a/.github/workflows/server-ci-template.yml +++ b/.github/workflows/server-ci-template.yml @@ -6,7 +6,7 @@ on: workflow_call: env: - go-version: "1.19.5" + go-version: "1.20.7" jobs: check-mocks: diff --git a/.github/workflows/server-test-template.yml b/.github/workflows/server-test-template.yml index 876dfef1c1..fbcbe93256 100644 --- a/.github/workflows/server-test-template.yml +++ b/.github/workflows/server-test-template.yml @@ -15,14 +15,14 @@ on: required: true type: string env: - go-version: "1.19.5" + go-version: "1.20.7" jobs: test: name: ${{ inputs.name }} runs-on: ubuntu-latest-8-cores env: COMPOSE_PROJECT_NAME: ghactions - BUILD_IMAGE: mattermost/mattermost-build-server:20230118_golang-1.19.5 + BUILD_IMAGE: mattermost/mattermost-build-server:20230904_golang-1.20.7 steps: - name: Checkout mattermost project uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 84f8176492..b33b386d74 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,7 +12,7 @@ include: variables: BUILD: "yes" - IMAGE_BUILD_SERVER: $CI_REGISTRY/mattermost/ci/images/mattermost-build-server:20230118_golang-1.19.5 + IMAGE_BUILD_SERVER: $CI_REGISTRY/mattermost/ci/images/mattermost-build-server:20230904_golang-1.20.7 IMAGE_BUILD_DOCKER: $CI_REGISTRY/mattermost/ci/devops-images/mattermost-build-docker:23.0.1-0 IMAGE_DIND: $CI_REGISTRY/mattermost/ci/devops-images/docker-dind:23.0.1-0 diff --git a/e2e-tests/.ci/server.override.yml b/e2e-tests/.ci/server.override.yml index 7eb3ca1f22..f80d776494 100644 --- a/e2e-tests/.ci/server.override.yml +++ b/e2e-tests/.ci/server.override.yml @@ -117,7 +117,7 @@ services: - "../../e2e-tests/cypress/:/cypress" utils: - image: "mattermostdevelopment/mirrored-golang:1.19.5" + image: "mattermost/mattermost-build-server:20230904_golang-1.20.7" entrypoint: [ "/bin/bash", "-c" ] command: [ "until [ -f /var/run/mm_terminate ]; do sleep 5; done" ] environment: diff --git a/server/Makefile b/server/Makefile index 144e427f80..6e022b5de7 100644 --- a/server/Makefile +++ b/server/Makefile @@ -397,7 +397,7 @@ email-mocks: ## Creates mocks for misc interfaces. $(GOBIN)/mockery --dir channels/app/email --name ServiceInterface --output channels/app/email/mocks --note 'Regenerate this file using `make email-mocks`.' platform-mocks: ## Creates mocks for platform interfaces. - $(GO) install github.com/vektra/mockery/v2/...@v2.14.0 + $(GO) install github.com/vektra/mockery/v2/...@v2.32.2 $(GOBIN)/mockery --dir channels/app/platform --name SuiteIFace --output channels/app/platform/mocks --note 'Regenerate this file using `make platform-mocks`.' mmctl-mocks: ## Creates mocks for mmctl @@ -488,7 +488,7 @@ test-server: export GOTESTSUM_FORMAT := $(GOTESTSUM_FORMAT) test-server: export GOTESTSUM_JUNITFILE := $(GOTESTSUM_JUNITFILE) test-server: export GOTESTSUM_JSONFILE := $(GOTESTSUM_JSONFILE) test-server: test-server-pre - $(GOBIN)/gotestsum --rerun-fails=3 --packages="$(TE_PACKAGES) $(EE_PACKAGES)" -- $(GOFLAGS) -timeout=90m + $(GOBIN)/gotestsum --rerun-fails=3 --packages="$(TE_PACKAGES) $(EE_PACKAGES)" -- $(GOFLAGS)-timeout=90m ifneq ($(IS_CI),true) ifneq ($(MM_NO_DOCKER),true) ifneq ($(TEMP_DOCKER_SERVICES),) diff --git a/server/build/Dockerfile.buildenv b/server/build/Dockerfile.buildenv index beeb1291ef..720b18dbee 100644 --- a/server/build/Dockerfile.buildenv +++ b/server/build/Dockerfile.buildenv @@ -1,3 +1,3 @@ -FROM golang:1.19.5@sha256:bb9811fad43a7d6fd2173248d8331b2dcf5ac9af20976b1937ecd214c5b8c383 +FROM golang:1.20.7-bullseye@sha256:c95c52c458a2678251e0769ea13c710b0c52814771c53a495f53b9e87f9c0e99 RUN apt-get update && apt-get install -y make git apt-transport-https ca-certificates curl software-properties-common build-essential zip xmlsec1 jq diff --git a/server/channels/app/platform/mocks/SuiteIFace.go b/server/channels/app/platform/mocks/SuiteIFace.go index a5f377280f..7a147902c2 100644 --- a/server/channels/app/platform/mocks/SuiteIFace.go +++ b/server/channels/app/platform/mocks/SuiteIFace.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.14.0. DO NOT EDIT. +// Code generated by mockery v2.32.2. DO NOT EDIT. // Regenerate this file using `make platform-mocks`. @@ -19,6 +19,10 @@ func (_m *SuiteIFace) GetSession(token string) (*model.Session, *model.AppError) ret := _m.Called(token) var r0 *model.Session + var r1 *model.AppError + if rf, ok := ret.Get(0).(func(string) (*model.Session, *model.AppError)); ok { + return rf(token) + } if rf, ok := ret.Get(0).(func(string) *model.Session); ok { r0 = rf(token) } else { @@ -27,7 +31,6 @@ func (_m *SuiteIFace) GetSession(token string) (*model.Session, *model.AppError) } } - var r1 *model.AppError if rf, ok := ret.Get(1).(func(string) *model.AppError); ok { r1 = rf(token) } else { @@ -58,13 +61,16 @@ func (_m *SuiteIFace) UserCanSeeOtherUser(userID string, otherUserId string) (bo ret := _m.Called(userID, otherUserId) var r0 bool + var r1 *model.AppError + if rf, ok := ret.Get(0).(func(string, string) (bool, *model.AppError)); ok { + return rf(userID, otherUserId) + } if rf, ok := ret.Get(0).(func(string, string) bool); ok { r0 = rf(userID, otherUserId) } else { r0 = ret.Get(0).(bool) } - var r1 *model.AppError if rf, ok := ret.Get(1).(func(string, string) *model.AppError); ok { r1 = rf(userID, otherUserId) } else { @@ -76,13 +82,12 @@ func (_m *SuiteIFace) UserCanSeeOtherUser(userID string, otherUserId string) (bo return r0, r1 } -type mockConstructorTestingTNewSuiteIFace interface { +// NewSuiteIFace creates a new instance of SuiteIFace. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +// The first argument is typically a *testing.T value. +func NewSuiteIFace(t interface { mock.TestingT Cleanup(func()) -} - -// NewSuiteIFace creates a new instance of SuiteIFace. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. -func NewSuiteIFace(t mockConstructorTestingTNewSuiteIFace) *SuiteIFace { +}) *SuiteIFace { mock := &SuiteIFace{} mock.Mock.Test(t) diff --git a/server/go.mod b/server/go.mod index b5d1a69eba..af0e15b9de 100644 --- a/server/go.mod +++ b/server/go.mod @@ -1,6 +1,6 @@ module github.com/mattermost/mattermost/server/v8 -go 1.19 +go 1.20 require ( code.sajari.com/docconv v1.3.5 @@ -65,12 +65,12 @@ require ( github.com/wiggin77/merror v1.0.5 github.com/xtgo/uuid v0.0.0-20140804021211-a0b114877d4c github.com/yuin/goldmark v1.5.4 - golang.org/x/crypto v0.10.0 + golang.org/x/crypto v0.12.0 golang.org/x/image v0.8.0 - golang.org/x/net v0.11.0 + golang.org/x/net v0.14.0 golang.org/x/sync v0.3.0 - golang.org/x/term v0.9.0 - golang.org/x/tools v0.10.0 + golang.org/x/term v0.11.0 + golang.org/x/tools v0.12.0 gopkg.in/mail.v2 v2.3.1 gopkg.in/yaml.v2 v2.4.0 ) @@ -188,9 +188,9 @@ require ( github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect go.etcd.io/bbolt v1.3.7 // indirect go.uber.org/atomic v1.11.0 // indirect - golang.org/x/mod v0.11.0 // indirect - golang.org/x/sys v0.9.0 // indirect - golang.org/x/text v0.10.0 // indirect + golang.org/x/mod v0.12.0 // indirect + golang.org/x/sys v0.11.0 // indirect + golang.org/x/text v0.12.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20230629202037-9506855d4529 // indirect google.golang.org/grpc v1.56.1 // indirect google.golang.org/protobuf v1.31.0 // indirect diff --git a/server/go.sum b/server/go.sum index 9337b0887a..d6b2621b84 100644 --- a/server/go.sum +++ b/server/go.sum @@ -717,8 +717,8 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.10.0 h1:LKqV2xt9+kDzSTfOhx4FrkEBcMrAgHSYgzywV9zcGmM= -golang.org/x/crypto v0.10.0/go.mod h1:o4eNf7Ede1fv+hwOwZsTHl9EsPFO6q6ZvYR8vYfY45I= +golang.org/x/crypto v0.12.0 h1:tFM/ta59kqch6LlvYnPa0yx5a83cL2nHflFhYKvv9Yk= +golang.org/x/crypto v0.12.0/go.mod h1:NF0Gs7EO5K4qLn+Ylc+fih8BSTeIjAP05siRnAh98yw= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -761,8 +761,8 @@ golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= -golang.org/x/mod v0.11.0 h1:bUO06HqtnRcc/7l71XBe4WcqTZ+3AH1J59zWDDwLKgU= -golang.org/x/mod v0.11.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/mod v0.12.0 h1:rmsUpXtvNzj340zd98LZ4KntptpfRHwpFOHG188oHXc= +golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -814,8 +814,8 @@ golang.org/x/net v0.3.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns= -golang.org/x/net v0.11.0 h1:Gi2tvZIJyBtO9SDr1q9h5hEQCp/4L2RQ+ar0qjx2oNU= -golang.org/x/net v0.11.0/go.mod h1:2L/ixqYpgIVXmeoSA/4Lu7BzTG4KIyPIryS4IsOd1oQ= +golang.org/x/net v0.14.0 h1:BONx9s002vGdD9umnlX1Po8vOZmrgH34qlHcD1MfK14= +golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20181017192945-9dcd33a902f4/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= @@ -918,16 +918,16 @@ golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.9.0 h1:KS/R3tvhPqvJvwcKfnBHJwwthS11LRhmM5D59eEXa0s= -golang.org/x/sys v0.9.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM= +golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.3.0/go.mod h1:q750SLmJuPmVoN1blW3UFBPREJfb1KmY3vwxfr+nFDA= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= golang.org/x/term v0.7.0/go.mod h1:P32HKFT3hSsZrRxla30E9HqToFYAQPCMs/zFMBUFqPY= -golang.org/x/term v0.9.0 h1:GRRCnKYhdQrD8kfRAdQ6Zcw1P0OcELxGLKJvtjVMZ28= -golang.org/x/term v0.9.0/go.mod h1:M6DEAAIenWoTxdKrOltXcmDY3rSplQUkrvaDU5FcQyo= +golang.org/x/term v0.11.0 h1:F9tnn/DA/Im8nCwm+fX+1/eBwi4qFjRT++MhtVC4ZX0= +golang.org/x/term v0.11.0/go.mod h1:zC9APTIj3jG3FdV/Ons+XE1riIZXG4aZ4GTHiPZJPIU= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -941,8 +941,9 @@ golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= -golang.org/x/text v0.10.0 h1:UpjohKhiEgNc0CSauXmwYftY1+LlaC75SJwh0SgCX58= golang.org/x/text v0.10.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= +golang.org/x/text v0.12.0 h1:k+n5B8goJNdU7hSvEtMUz3d1Q6D/XW4COJSJR6fN0mc= +golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -1004,8 +1005,8 @@ golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/tools v0.4.0/go.mod h1:UE5sM2OK9E/d67R0ANs2xJizIymRP5gJU295PvKXxjQ= golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= -golang.org/x/tools v0.10.0 h1:tvDr/iQoUqNdohiYm0LmmKcBk+q86lb9EprIUFhHHGg= -golang.org/x/tools v0.10.0/go.mod h1:UJwyiVBsOA2uwvK/e5OY3GTpDUJriEd+/YlqAwLPmyM= +golang.org/x/tools v0.12.0 h1:YW6HUoUmYBpwSgyaGaZq1fHjrBjX1rlpZ54T6mu2kss= +golang.org/x/tools v0.12.0/go.mod h1:Sc0INKfu04TlqNoRA1hgpFZbhYXHPr4V5DzpSBTPqQM= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/server/public/go.mod b/server/public/go.mod index d6611bdd06..3c9e32c478 100644 --- a/server/public/go.mod +++ b/server/public/go.mod @@ -1,6 +1,6 @@ module github.com/mattermost/mattermost/server/public -go 1.19 +go 1.20 require ( github.com/blang/semver/v4 v4.0.0 diff --git a/server/scripts/mirror-docker-images.json b/server/scripts/mirror-docker-images.json index fe931b3493..5823ea12a3 100644 --- a/server/scripts/mirror-docker-images.json +++ b/server/scripts/mirror-docker-images.json @@ -31,9 +31,6 @@ "node16.14.2-slim-chrome100-ff99-edge": "cypress/browsers:node16.14.2-slim-chrome100-ff99-edge@sha256:f8459ee677ce356eff64698095fbdf48eb9ab018fc5eb0d30c07ba23884edace", "node-18.16.1-chrome-114.0.5735.133-1-ff-114.0.2-edge-114.0.1823.51-1": "cypress/browsers:node-18.16.1-chrome-114.0.5735.133-1-ff-114.0.2-edge-114.0.1823.51-1@sha256:f798d6cc25d724210be3660e95f63ae75d052ef392e3fc5ae728d02da7e52df8" }, - "golang": { - "1.19.5": "golang:1.19.5@sha256:bb9811fad43a7d6fd2173248d8331b2dcf5ac9af20976b1937ecd214c5b8c383" - }, "node": { "16.10.0": "node:16.10.0", "16.17.0": "node:16.17.0", diff --git a/tools/mmgotool/go.mod b/tools/mmgotool/go.mod index 6fca8c5b76..91221c21d0 100644 --- a/tools/mmgotool/go.mod +++ b/tools/mmgotool/go.mod @@ -1,6 +1,6 @@ module github.com/mattermost/mattermost/tools/mmgotool -go 1.19 +go 1.20 require github.com/spf13/cobra v1.7.0