AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Mockery CIPD package: Build from source to support Go 1.18.

Browse Source 
See comments in create.py for rationale and details.

This compatibility issue will likely be fixed in a future Mockery version, but since we're sticking with with v2.4.0, building from source with the necessary changes seems like the most straightforward option.

Note: This CL should not cause any diffs in generated mock files.

Bug: skia:13063
Change-Id: Ia9b2c48ea64d85244c09c75a5d424e09bdac7a2d
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/522098
Reviewed-by: Joe Gregorio <jcgregorio@google.com>
Commit-Queue: Leandro Lovisolo <lovisolo@google.com>
This commit is contained in:
Leandro Lovisolo 2022-03-18 03:56:55 +00:00 committed by SkCQ
parent 2fdcca2777
commit 10258645fc
2 changed files with 43 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
infra/bots/assets/mockery/VERSION
View File

@ -1 +1 @@
1
2

46
infra/bots/assets/mockery/create.py
View File

@ -12,19 +12,57 @@
import argparse
import subprocess
import os
import shutil
URL = "https://github.com/vektra/mockery/releases/download/v2.4.0/mockery_2.4.0_Linux_x86_64.tar.gz"
REPO_URL = "https://github.com/vektra/mockery.git"
REPO_DIR = "mockery_repo"
BINARY_NAME = "mockery"
def create_asset(target_dir):
"""Create the asset."""
os.chdir(target_dir)
output = subprocess.check_output(["wget", URL, "--output-document=mockery.tar.gz"])
# We build mockery 2.4.0 from source to fix an issue with Go 1.18. Read the
# comments below for details.
output = subprocess.check_output(["git", "clone", REPO_URL, REPO_DIR])
print(output)
output = subprocess.check_output(["tar", "-xvf", "mockery.tar.gz"])
os.chdir(os.path.join(target_dir, REPO_DIR))
output = subprocess.check_output(["git", "checkout", "v2.4.0"])
# Under Go 1.18, mockery v2.4.0 through v2.10.0 fails with errors such as:
#
# internal error: package "fmt" without types was imported from ...
#
# This can be fixed by updating golang.org/x/tools to a more recent version.
# For more details, please see https://github.com/vektra/mockery/issues/434
# and https://github.com/golang/go/issues/49608.
output = subprocess.check_output(["go", "get", "golang.org/x/tools@v0.1.10"])
print(output)
os.remove("mockery.tar.gz")
output = subprocess.check_output(["go", "mod", "tidy"])
print(output)
# Build mockery with the same flags as in release builds.
#
# If we don't specify a SemVer value, mockery will generate files with a
# "Code generated by mockery v0.0.0-dev. DO NOT EDIT." comment at the top,
# which causes diffs due to the changed version. Thus, it is important to set
# the SemVer value to the correct version.
#
# See
# https://github.com/vektra/mockery/blob/271c74610ef710a4c30e19a42733796c50e7ea3f/.goreleaser.yml#L9.
ldflags = "-s -w -X github.com/vektra/mockery/v2/pkg/config.SemVer=2.4.0"
build_command = ["go", "build", "-ldflags=\"%s\"" % ldflags]
print("Building with command:", build_command)
output = subprocess.check_output(["go", "build", "-ldflags=" + ldflags])
print(output)
# Copy binary outside of the cloned repository directory and clean up.
output = subprocess.check_output(["cp", BINARY_NAME, ".."])
shutil.copy(os.path.join(target_dir, REPO_DIR, BINARY_NAME), target_dir)
shutil.rmtree(os.path.join(target_dir, REPO_DIR))
os.chdir(target_dir)
def main():