Skip to content

Commit

Permalink
Fix mockery install to work on Apple Silicon Macs (#772)
Browse files Browse the repository at this point in the history
The URL used to download the Mockery binary is composed using the
current hardware platform string. For Apple Silicon Macs, this is
`aarch64`, whereas the Mockery binary uses `arm64`.

This change uses `arm64` in place of `aarch64` as the hardware platform
to build the Mockery download URL.

The version of Mockery is also updated.

Signed-off-by: Mark S. Lewis <[email protected]>
  • Loading branch information
bestbeforetoday authored Nov 21, 2024
1 parent cc10ac3 commit 6db0d8c
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
1 change: 1 addition & 0 deletions .mockery.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
issue-845-fix: true
with-expecter: true
exported: true
filename: "{{.InterfaceName | lower}}_mock_test.go"
Expand Down
5 changes: 4 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,12 @@ scenario_dir := $(base_dir)/scenario

go_bin_dir := $(shell go env GOPATH)/bin

mockery_version := 2.46.2
mockery_version := 2.48.0
kernel_name := $(shell uname -s)
machine_hardware := $(shell uname -m)
ifeq ($(machine_hardware), aarch64)
machine_hardware := arm64
endif

export SOFTHSM2_CONF ?= $(base_dir)/softhsm2.conf
TMPDIR ?= /tmp
Expand Down

0 comments on commit 6db0d8c

Please sign in to comment.