Skip to content

Commit

Permalink
Refactory: move api and client-go to standalone repos (#366)
Browse files Browse the repository at this point in the history
* move api and client-go to standalone repos

Signed-off-by: huabing zhao <zhaohuabing@gmail.com>

* fix test

Signed-off-by: huabing zhao <zhaohuabing@gmail.com>

* refactory: move pkg and plugin to internal directory since they're not public packages

Signed-off-by: huabing zhao <zhaohuabing@gmail.com>

* set test condition

Signed-off-by: huabing zhao <zhaohuabing@gmail.com>

* fix test

Signed-off-by: huabing zhao <zhaohuabing@gmail.com>

* fix test

Signed-off-by: huabing zhao <zhaohuabing@gmail.com>

* fix test

Signed-off-by: huabing zhao <zhaohuabing@gmail.com>

* fix test

Signed-off-by: huabing zhao <zhaohuabing@gmail.com>

* fix lint

Signed-off-by: huabing zhao <zhaohuabing@gmail.com>

* fix lint

Signed-off-by: huabing zhao <zhaohuabing@gmail.com>

* fix lint

Signed-off-by: huabing zhao <zhaohuabing@gmail.com>

---------

Signed-off-by: huabing zhao <zhaohuabing@gmail.com>
  • Loading branch information
zhaohuabing committed Jul 30, 2023
1 parent d75b1d8 commit 8b98106
Show file tree
Hide file tree
Showing 92 changed files with 1,244 additions and 1,621 deletions.
22 changes: 18 additions & 4 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,20 @@
---
name: ci
on: [push, pull_request]
on:
push:
branches:
- "master"
- "release/v*"
paths-ignore:
- "**/*.png"
- "**/*.md"
pull_request:
branches:
- "master"
- "release/v*"
paths-ignore:
- "**/*.png"
- "**/*.md"
jobs:
yamllint:
name: yamllint
Expand All @@ -24,9 +38,9 @@ jobs:
with:
go-version: 1.19
- name: Build
run: go build -race ./...
run: go build -race ./internal/...
- name: Test
run: go test -race `go list ./... | grep -v e2e`
run: go test -race `go list ./internal/... | grep -v e2e`
go-lint:
name: go-lint
runs-on: ubuntu-latest
Expand All @@ -36,7 +50,7 @@ jobs:
- name: golint
uses: Jerome1337/golint-action@v1.0.2
with:
golint-path: './...'
golint-path: './internal/...'
- name: Setup Go
uses: actions/setup-go@v1
with:
Expand Down
10 changes: 5 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ uninstall-demo-brpc:
bash demo/uninstall-demo.sh brpc
test: style-check
$(GOMOD) tidy
$(GOTEST) -race `go list ./... | grep -v e2e`
$(GOTEST) -race `go list ./internal/... | grep -v e2e`
build: test
CGO_ENABLED=0 GOOS=$(IMAGE_OS) GOARCH=$(IMAGE_ARCH) $(GOBUILD) -o $(OUT)/$(IMAGE_ARCH)/$(IMAGE_OS)/$(IMAGE_NAME) $(MAIN_PATH)
docker-build: build
Expand All @@ -72,10 +72,10 @@ cross_build_images:
clean:
rm -rf $(OUT)
style-check:
gofmt -l -d ./
goimports -l -d ./
gofmt -l -d ./internal
goimports -l -d ./internal
lint:
golint ./...
golint ./internal/...
golangci-lint run --tests="false"
e2e-dubbo:
go test -v github.com/aeraki-mesh/aeraki/test/e2e/dubbo/...
Expand All @@ -88,4 +88,4 @@ e2e-redis:
e2e-metaprotocol:
go test -v github.com/aeraki-mesh/aeraki/test/e2e/metaprotocol/...
e2e: e2e-dubbo e2e-thrift e2e-kafka-zookeeper e2e-redis e2e-metaprotocol
.PHONY: build docker-build docker-push clean style-check lint e2e-dubbo e2e-thrift e2e-kafka-zookeeper e2e install demo uninstall-demo
.PHONY: build docker-build docker-push clean style-check lint e2e-dubbo e2e-thrift e2e-kafka-zookeeper e2e install demo uninstall-demo
279 changes: 0 additions & 279 deletions Makefile.api.mk

This file was deleted.

3 changes: 3 additions & 0 deletions api/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
This package is deprecated!

Aeraki API has been moved to a standalone reposition: https://github.com/aeraki-mesh/api.
1 change: 1 addition & 0 deletions api/dubbo/v1alpha1/dubbo_authorization_policy.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 0 additions & 18 deletions build_api.sh

This file was deleted.

3 changes: 3 additions & 0 deletions client-go/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
This package is deprecated!

Aeraki API client-go has been moved to a standalone reposition: https://github.com/aeraki-mesh/client-go.
2 changes: 1 addition & 1 deletion client-go/pkg/apis/metaprotocol/v1alpha1/types.gen.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 8b98106

Please sign in to comment.