Skip to content

Commit

Permalink
smithy-go replace commands (#865)
Browse files Browse the repository at this point in the history
  • Loading branch information
skmcgrail committed Oct 30, 2020
1 parent 0061141 commit 4f64b96
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 17 deletions.
13 changes: 10 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ LINTIGNORESINGLEFIGHT='internal/sync/singleflight/singleflight.go:.+error should
UNIT_TEST_TAGS=
BUILD_TAGS=-tags "example,codegen,integration,ec2env"

SMITHY_GO_SRC ?= $(shell pwd)/../smithy-go

EACHMODULE_FAILFAST ?= true
EACHMODULE_FAILFAST_FLAG=-fail-fast=${EACHMODULE_FAILFAST}

Expand Down Expand Up @@ -38,7 +40,7 @@ all: generate unit
###################
# Code Generation #
###################
generate: smithy-generate gen-config-asserts gen-repo-mod-replace tidy-modules-. add-module-license-files gen-aws-ptrs
generate: smithy-generate gen-config-asserts gen-repo-mod-replace gen-mod-dropreplace-smithy tidy-modules-. add-module-license-files gen-aws-ptrs

smithy-generate:
cd codegen && ./gradlew clean build -Plog-tests && ./gradlew clean
Expand Down Expand Up @@ -67,8 +69,13 @@ gen-repo-mod-replace:
@echo "Generating go.mod replace for repo modules"
cd internal/repotools/cmd/makerelative && go run ./

gen-mod-replace-local:
./mod_replace_local_submodules.sh `pwd` `pwd` `pwd`/../smithy-go
gen-mod-replace-smithy:
cd ./internal/repotools/cmd/eachmodule \
&& go run . "go mod edit -replace github.com/awslabs/smithy-go=${SMITHY_GO_SRC}"

gen-mod-dropreplace-smithy:
cd ./internal/repotools/cmd/eachmodule \
&& go run . "go mod edit -dropreplace github.com/awslabs/smithy-go"

gen-aws-ptrs:
cd aws && go generate
Expand Down
14 changes: 0 additions & 14 deletions mod_replace_local_submodules.sh

This file was deleted.

0 comments on commit 4f64b96

Please sign in to comment.