Skip to content

Commit

Permalink
Replace gogeninstall recipe with depsinstall
Browse files Browse the repository at this point in the history
The distinction between "go generate" and general build
dependencies isn't important enough to maintain separate
Makefile recipes.

refs atc0005/shared-project-resources#71
  • Loading branch information
atc0005 committed Feb 23, 2023
1 parent 86abd91 commit 182ae9a
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 11 deletions.
4 changes: 0 additions & 4 deletions .github/workflows/lint-and-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,4 @@ jobs:

lint_and_build_using_makefile:
name: Makefile
with:
# Indicate to imported workflow that the gogeninstall Makefile recipe is
# needed.
gogeninstall: true
uses: atc0005/shared-project-resources/.github/workflows/lint-and-build-using-make.yml@master
14 changes: 7 additions & 7 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -127,17 +127,17 @@ lintinstall:

@echo "Finished updating linting tools"

.PHONY: gogeninstall
## gogeninstall: install tools used by go generate
gogeninstall:
@echo "Installing go generate dependencies"
.PHONY: depsinstall
## depsinstall: install or update common build dependencies
depsinstall:
@echo "Installing current version of build dependencies"

@export PATH="${PATH}:$(go env GOPATH)/bin"

@echo "Installing go-winres ..."
@go install github.com/tc-hib/go-winres@latest
@echo "Installing latest go-winres version ..."
go install github.com/tc-hib/go-winres@latest

@echo "Finished installing go generate dependencies"
@echo "Finished installing or updating build dependencies"

.PHONY: linting
## linting: runs common linting checks
Expand Down

0 comments on commit 182ae9a

Please sign in to comment.