Skip to content

Allow for versions of Mockery other than V2 #177

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dcbickfo merged 6 commits into from
Apr 28, 2025
Merged

Allow for versions of Mockery other than V2 #177

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3db70aa
determine mockery version
dcbickfo Apr 25, 2025
d038d98
reference mockery v3
dcbickfo Apr 25, 2025
6697617
extra =
dcbickfo Apr 25, 2025
da5e13c
'bad mockery name
dcbickfo Apr 25, 2025
2819517
can't use MOCKERY_VERSION
dcbickfo Apr 25, 2025
5e2dd46
change over to v0
dcbickfo Apr 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 30 additions & 4 deletions go/deps/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ inputs:
FLIPPCIRCLECIPULLER_REPO_TOKEN:
description: Flipp circleci repo token
required: true
MOCKERY_INSTALL_VERSION:
description: The version of mockery to use
required: false
default: ""

runs:
using: 'composite'
Expand Down Expand Up @@ -37,18 +41,40 @@ runs:
run: go generate ./...
shell: bash
- name: Grab mockery version
if: ${{ hashFiles('.tool-versions') != '' }}
run: |
MOCKERY_INSTALL_VERSION=$(awk '/^mockery[[:space:]]+/ {print "v"$2}' .tool-versions)
# Default to empty version and v1 config
MOCKERY_INSTALL_VERSION=""

# Check for MOCKERY_INSTALL_VERSION input
if [ -n "${{ inputs.MOCKERY_INSTALL_VERSION }}" ]; then
MOCKERY_INSTALL_VERSION="${{ inputs.MOCKERY_INSTALL_VERSION }}"
echo "Using MOCKERY_INSTALL_VERSION=${MOCKERY_INSTALL_VERSION} from input"
fi

# Check .tool-versions for mockery version
if [ -z "$MOCKERY_INSTALL_VERSION" ] && [ -f ".tool-versions" ] && [ -s ".tool-versions" ]; then
MOCKERY_INSTALL_VERSION=$(awk '/^mockery[[:space:]]+/ {print "v"$2}' .tool-versions)
echo "Using MOCKERY_INSTALL_VERSION=${MOCKERY_INSTALL_VERSION} from .tool-versions"
fi

# Grab the major version from the full version
MOCKERY_INSTALL_MAJOR_VERSION=""
if [ -n "$MOCKERY_INSTALL_VERSION" ]; then
temp_version=${MOCKERY_INSTALL_VERSION#v}
MOCKERY_INSTALL_MAJOR_VERSION=${temp_version%%.*}
echo "Extracted MOCKERY_INSTALL_MAJOR_VERSION=${MOCKERY_INSTALL_MAJOR_VERSION}"
fi

echo "MOCKERY_INSTALL_MAJOR_VERSION=${MOCKERY_INSTALL_MAJOR_VERSION}" >> $GITHUB_ENV
echo "MOCKERY_INSTALL_VERSION=${MOCKERY_INSTALL_VERSION}" >> $GITHUB_ENV
shell: bash
- name: Install mockery
if: ${{ hashFiles('.mockery.yml') != '' }}
run: |
if [ -n "${{ env.MOCKERY_INSTALL_VERSION }}" ]; then
go install github.com/vektra/mockery/v2@${{ env.MOCKERY_INSTALL_VERSION }}
go install github.com/vektra/mockery/v${{ env.MOCKERY_INSTALL_MAJOR_VERSION }}@${{ env.MOCKERY_INSTALL_VERSION }}
else
go install github.com/vektra/mockery/v2
go install github.com/vektra/mockery/v2@latest
fi
shell: bash
- name: Generate mocks
Expand Down
Loading