Homebrew fixes release 5.39

.circleci/config.yml

@@ -7,7 +7,7 @@ executors:
   default:
     working_directory: ~/go/src/github.com/mattermost/mmctl
     docker:
-      - image: circleci/golang:1.15.5
+      - image: circleci/golang:1.17.0
 
 aliases:
 - &restore_cache
@@ -25,13 +25,13 @@ commands:
     parameters:
       version:
         type: string
-        default: 1.31.0
+        default: 1.42.0
       gobin:
         type: string
         default: /go/bin
       prefix:
         type: string
-        default: v1
+        default: v2
         description: Prefix for cache key to store the binary.
     steps:
       - restore_cache:
@@ -79,7 +79,7 @@ jobs:
 
   setup:
     docker:
-      - image: mattermost/mattermost-build-webapp:oct-2-2018
+      - image: mattermost/mattermost-build-server:20210810_golang-1.16.7
     working_directory: ~/go/src/github.com/mattermost/
     steps:
       - run:
@@ -131,7 +131,7 @@ jobs:
               --env MM_SQLSETTINGS_DATASOURCE=postgres \
               -v ~/go/src:/go/src \
               -w /go/src/github.com/mattermost/mmctl \
-              mattermost/mattermost-build-server:20201119_golang-1.15.5 \
+              mattermost/mattermost-build-server:20210810_golang-1.16.7 \
               bash -c 'ulimit -n 8096 && make coverage'
       - codecov/upload:
         file:  coverage.txt

.gitlab-ci.yml

@@ -7,9 +7,13 @@ include:
   ref: master
   file: private.yml
 
+variables:
+  IMAGE_BUILD_MMCTL: $CI_REGISTRY/mattermost/ci/images/mattermost-build-server:20210824_golang-1.17.0
+  IMAGE_BUILD_SERVER: $CI_REGISTRY/mattermost/ci/images/mattermost-build-server:20210810_golang-1.16.7
+
 docs:
   stage: test
-  image: $CI_REGISTRY/mattermost/ci/images/mattermost-build-server:20201119_golang-1.15.5
+  image: $IMAGE_BUILD_MMCTL
   script:
     - echo $CI_COMMIT_REF_NAME
     - echo "Making sure docs are updated"
@@ -62,7 +66,7 @@ lint:
         --env MM_SQLSETTINGS_DATASOURCE=postgres \
         -v /builds/${CI_PROJECT_NAMESPACE}:/mattermost \
         -w /mattermost/mmctl \
-        $CI_REGISTRY/mattermost/ci/images/mattermost-build-server:20201119_golang-1.15.5 \
+        $IMAGE_BUILD_SERVER \
         bash -c 'ulimit -n 8096; ls -al; make test-all'
     - docker logs -f server
     - exit $(docker inspect server --format='{{.State.ExitCode}}')
@@ -71,15 +75,10 @@ lint:
 
 build:
   stage: test
-  image: $CI_REGISTRY/mattermost/ci/images/mattermost-build-server:20201119_golang-1.15.5
+  image: $IMAGE_BUILD_MMCTL
   script:
     - make package
   artifacts:
     paths:
       - build
     expire_in: 3 hours
-  rules:
-    - if: '$CI_COMMIT_REF_NAME == "master"'
-    - if: '$CI_COMMIT_REF_NAME =~ /^v.*\d/' # release
-    - if: '$CI_COMMIT_REF_NAME =~ /^v.*\D{3,}/' # -rc
-    - if: '$CI_COMMIT_REF_NAME =~ /^release-/'

commands/main_test.go

@@ -1,6 +1,7 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
+//go:build e2e
 // +build e2e
 
 package commands

commands/mmctl_e2e_test.go

@@ -1,6 +1,7 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
+//go:build e2e
 // +build e2e
 
 package commands

commands/mmctl_unit_test.go

@@ -1,6 +1,7 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
+//go:build unit
 // +build unit
 
 package commands

commands/utils_unix.go

@@ -1,6 +1,7 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
+//go:build linux || darwin
 // +build linux darwin
 
 package commands

magefile.go

@@ -1,6 +1,7 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
+//go:build mage
 // +build mage
 
 package main