Skip to content

Commit

Permalink
Merge pull request #26 from CrowdStrike/feature/update_makefile
Browse files Browse the repository at this point in the history
update make file to remove go version check
  • Loading branch information
gtheodorio authored Sep 26, 2024
2 parents 97cd49f + a3359e4 commit f3e120e
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
dotnetversion:
- 6.0.x
goversion:
- '1.21.x'
- 1.22.x
nodeversion:
- 18.x
pythonversion:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ jobs:
fail-fast: true
matrix:
goversion:
- 1.21.x
- 1.22.x

publish_sdk:
name: Publish SDKs
Expand Down Expand Up @@ -163,7 +163,7 @@ jobs:
dotnetversion:
- 6.0.x
goversion:
- 1.21.x
- 1.22.x
nodeversion:
- 18.x
pythonversion:
Expand Down
15 changes: 2 additions & 13 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -27,17 +27,7 @@ REQUIRED_GO_MAJOR_VERSION := 1
REQUIRED_GO_MINOR_VERSION := 21
GO_VERSION_VALIDATION_ERR_MSG := Golang version $(REQUIRED_GO_MAJOR_VERSION).$(REQUIRED_GO_MINOR_VERSION) is required

.PHONY: development provider build_sdks build_nodejs build_dotnet build_go build_python cleanup validate_go_version

validate_go_version: ## Validates the installed version of go
@if [ $(GO_MAJOR_VERSION) -ne $(REQUIRED_GO_MAJOR_VERSION) ]; then \
echo '$(GO_VERSION_VALIDATION_ERR_MSG)';\
exit 1 ;\
fi
@if [ $(GO_MINOR_VERSION) -ne $(REQUIRED_GO_MINOR_VERSION) ]; then \
echo '$(GO_VERSION_VALIDATION_ERR_MSG)';\
exit 1 ;\
fi
.PHONY: development provider build_sdks build_nodejs build_dotnet build_go build_python cleanup

development:: install_plugins provider lint_provider build_sdks install_sdks cleanup # Build the provider & SDKs for a development environment

Expand Down Expand Up @@ -98,7 +88,6 @@ $(WORKING_DIR)/bin/$(JAVA_GEN)::
lint_provider:: provider # lint the provider code
cd provider && golangci-lint run -c ../.golangci.yml


cleanup:: # cleans up the temporary directory
rm -r $(WORKING_DIR)/bin
rm -f provider/cmd/${PROVIDER}/schema.go
Expand All @@ -116,7 +105,7 @@ fmt::
@echo "Fixing source code with gofmt..."
find . -name '*.go' | grep -v vendor | xargs gofmt -s -w

install_plugins:: validate_go_version
install_plugins::
[ -x $(shell which pulumi) ] || curl -fsSL https://get.pulumi.com | sh
pulumi plugin install resource random 4.3.1

Expand Down

0 comments on commit f3e120e

Please sign in to comment.