Merge branch 'master' into add-option-filename-prefix-suffix

vektra · Feb 9, 2023 · 347308c · 347308c
2 parents c98782f + f6ff7ae
commit 347308c
Show file tree

Hide file tree

Showing 89 changed files with 2,701 additions and 1,462 deletions.
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
@@ -1,13 +1,36 @@
+PLEASE READ
+-------------
+
+DO NOT submit tickets without _first_ using the latest version of Golang, clearing your local golang package cache, and re-building mockery using the _latest_ Golang version and the _latest_ version of mockery. Please provide evidence this has been done in your issue. Failure to provide this evidence will likely result in your issue being closed.
+
 Description
 -------------
 
 [Description of the bug or feature]
 
-Version
+Mockery Version
 --------
 
 [version of mockery being used]
 
+Golang Version
+--------------
+
+[version of golang being used]
+
+```
+NOTE: Please upgrade to the latest golang version before submitting tickets!
+```
+
+Installation Method
+-------------------
+
+- [ ] Binary Distribution
+- [ ] Docker
+- [ ] brew
+- [ ] go install
+- [ ] Other: [specify]
+
 Steps to Reproduce
 ------------------
 

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -23,6 +23,8 @@ Version of Golang used when building/testing:
 - [ ] 1.16
 - [ ] 1.17
 - [ ] 1.18
+- [ ] 1.19
+- [ ] 1.20
 
 How Has This Been Tested?
 ---------------------------

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -8,6 +8,9 @@ on:
 jobs:
   release:
     runs-on: ubuntu-latest
+    env:
+      DOCKER_CLI_EXPERIMENTAL: "enabled"
+
     steps:
       - uses: actions/checkout@v2
         with:
@@ -16,7 +19,13 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.18
+          go-version: '1.20'
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
 
       - name: Login to DockerHub
         uses: docker/login-action@v1

diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
@@ -12,7 +12,7 @@ jobs:
     strategy:
       matrix:
         os: [ macos-latest, ubuntu-latest]
-        go_vers: [1.16, 1.17, 1.18]
+        go_vers: ['1.20']
     steps:
       - uses: actions/checkout@v2
         with:

diff --git a/.goreleaser.yml b/.goreleaser.yml
@@ -34,20 +34,47 @@ snapshot:
 changelog:
     sort: asc
 dockers:
-  - goos: linux
+  - image_templates: ["vektra/mockery:{{ .Tag }}-amd64"]
     goarch: amd64
-    image_templates:
-      - 'vektra/mockery:{{ .Tag }}'
-      - 'vektra/mockery:v{{ .Major }}'
-      - 'vektra/mockery:v{{ .Major }}.{{ .Minor }}'
-      - 'vektra/mockery:latest'
+    dockerfile: Dockerfile
+    use: buildx
+    build_flag_templates:
+      - "--pull"
+      - "--label=org.opencontainers.image.created={{.Date}}"
+      - "--label=org.opencontainers.image.name={{.ProjectName}}"
+      - "--label=org.opencontainers.image.revision={{.FullCommit}}"
+      - "--label=org.opencontainers.image.version={{.Version}}"
+      - "--label=org.opencontainers.image.source={{.GitURL}}"
+      - "--platform=linux/amd64"
+  - image_templates: ["vektra/mockery:{{ .Tag }}-arm64"]
+    goarch: arm64
+    dockerfile: Dockerfile
+    use: buildx
     build_flag_templates:
       - "--pull"
       - "--label=org.opencontainers.image.created={{.Date}}"
       - "--label=org.opencontainers.image.name={{.ProjectName}}"
       - "--label=org.opencontainers.image.revision={{.FullCommit}}"
       - "--label=org.opencontainers.image.version={{.Version}}"
       - "--label=org.opencontainers.image.source={{.GitURL}}"
+      - "--platform=linux/arm64"
+docker_manifests:
+  - name_template: vektra/mockery:{{ .Tag }}
+    image_templates:
+      - vektra/mockery:{{ .Tag }}-amd64
+      - vektra/mockery:{{ .Tag }}-arm64
+  - name_template: vektra/mockery:v{{ .Major }}
+    image_templates:
+      - vektra/mockery:{{ .Tag }}-amd64
+      - vektra/mockery:{{ .Tag }}-arm64
+  - name_template: vektra/mockery:v{{ .Major }}.{{ .Minor }}
+    image_templates:
+      - vektra/mockery:{{ .Tag }}-amd64
+      - vektra/mockery:{{ .Tag }}-arm64
+  - name_template: vektra/mockery:latest
+    image_templates:
+      - vektra/mockery:{{ .Tag }}-amd64
+      - vektra/mockery:{{ .Tag }}-arm64
 brews:
   - homepage: https://github.com/vektra/mockery
     description: "A mock code autogenerator for Go"

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.18-alpine as builder
+FROM golang:1.20-alpine as builder
 
 COPY mockery /usr/local/bin
 

diff --git a/Makefile b/Makefile
@@ -14,6 +14,8 @@ test: mocks
 mocks: $(shell find . -type f -name '*.go' -not -name '*_test.go')
 	go run . --dir pkg/fixtures --output mocks/pkg/fixtures
 	go run . --all=false --print --dir pkg/fixtures --name RequesterVariadic --structname RequesterVariadicOneArgument --unroll-variadic=False > mocks/pkg/fixtures/RequesterVariadicOneArgument.go
+	go run . --all=false --print --dir pkg/fixtures --name Expecter --with-expecter > mocks/pkg/fixtures/Expecter.go
+	go run . --all=false --print --dir pkg/fixtures --name RequesterReturnElided --with-expecter > mocks/pkg/fixtures/RequesterReturnElided.go
 	@touch mocks
 
 .PHONY: install