Skip to content

Commit f3e120e

Browse files
authored
Merge pull request #26 from CrowdStrike/feature/update_makefile
update make file to remove go version check
2 parents 97cd49f + a3359e4 commit f3e120e

File tree

3 files changed

+5
-16
lines changed

3 files changed

+5
-16
lines changed

.github/workflows/pull-request.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
dotnetversion:
2121
- 6.0.x
2222
goversion:
23-
- '1.21.x'
23+
- 1.22.x
2424
nodeversion:
2525
- 18.x
2626
pythonversion:

.github/workflows/release.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ jobs:
7070
fail-fast: true
7171
matrix:
7272
goversion:
73-
- 1.21.x
73+
- 1.22.x
7474

7575
publish_sdk:
7676
name: Publish SDKs
@@ -163,7 +163,7 @@ jobs:
163163
dotnetversion:
164164
- 6.0.x
165165
goversion:
166-
- 1.21.x
166+
- 1.22.x
167167
nodeversion:
168168
- 18.x
169169
pythonversion:

Makefile

+2-13
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,7 @@ REQUIRED_GO_MAJOR_VERSION := 1
2727
REQUIRED_GO_MINOR_VERSION := 21
2828
GO_VERSION_VALIDATION_ERR_MSG := Golang version $(REQUIRED_GO_MAJOR_VERSION).$(REQUIRED_GO_MINOR_VERSION) is required
2929

30-
.PHONY: development provider build_sdks build_nodejs build_dotnet build_go build_python cleanup validate_go_version
31-
32-
validate_go_version: ## Validates the installed version of go
33-
@if [ $(GO_MAJOR_VERSION) -ne $(REQUIRED_GO_MAJOR_VERSION) ]; then \
34-
echo '$(GO_VERSION_VALIDATION_ERR_MSG)';\
35-
exit 1 ;\
36-
fi
37-
@if [ $(GO_MINOR_VERSION) -ne $(REQUIRED_GO_MINOR_VERSION) ]; then \
38-
echo '$(GO_VERSION_VALIDATION_ERR_MSG)';\
39-
exit 1 ;\
40-
fi
30+
.PHONY: development provider build_sdks build_nodejs build_dotnet build_go build_python cleanup
4131

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

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

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

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

0 commit comments

Comments
 (0)