Skip to content

Commit

Permalink
Merge branch 'main' into feature/mysql
Browse files Browse the repository at this point in the history
  • Loading branch information
seeflood authored May 24, 2022
2 parents 681ed86 + 5bada7f commit d35ec1a
Show file tree
Hide file tree
Showing 10 changed files with 43 additions and 188 deletions.
3 changes: 1 addition & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -217,8 +217,7 @@ style.quickstart:
# ==============================================================================
.PHONY: license
license:
# For more details: https://github.com/apache/skywalking-eyes#docker-image
docker run -it --rm -v $(pwd):/github/workspace apache/skywalking-eyes header fix
@$(MAKE) checker.license.fix

# ==============================================================================
## integrate.wasm: Run integration test with wasm.
Expand Down
6 changes: 6 additions & 0 deletions demo/sequencer/common/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
You can run this demo with different component names.
For example:
```go
go build -o client
./client -s "state_demo"
```
1 change: 1 addition & 0 deletions demo/sequencer/common/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ func main() {
Metadata: nil,
})
if err != nil {
fmt.Print(err)
return
}
fmt.Printf("Next id:%v \n", id)
Expand Down
39 changes: 0 additions & 39 deletions demo/sequencer/in-memory/client.go

This file was deleted.

39 changes: 0 additions & 39 deletions demo/sequencer/mongo/client.go

This file was deleted.

39 changes: 0 additions & 39 deletions demo/sequencer/redis/client.go

This file was deleted.

39 changes: 0 additions & 39 deletions demo/sequencer/zookeeper/client.go

This file was deleted.

10 changes: 10 additions & 0 deletions make/ci.mk
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,16 @@ checker.deadlink:
@echo "===========> Checking Dead Links"
sh ${SCRIPT_DIR}/check-dead-link.sh

.PHONY: checker.license
checker.license:
# For more details: https://github.com/apache/skywalking-eyes#docker-image
docker run -it --rm -v $(ROOT_DIR):/github/workspace apache/skywalking-eyes header check

.PHONY: checker.license.fix
checker.license.fix:
# For more details: https://github.com/apache/skywalking-eyes#docker-image
docker run -it --rm -v $(ROOT_DIR):/github/workspace apache/skywalking-eyes header fix

QUICKSTART_VERSION ?= default

.PHONY: checker.quickstart
Expand Down
27 changes: 12 additions & 15 deletions pkg/wasm/abi.go
Original file line number Diff line number Diff line change
@@ -1,18 +1,15 @@
/*
* Copyright 2021 Layotto Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
// Copyright 2021 Layotto Authors
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package wasm

Expand Down
28 changes: 13 additions & 15 deletions sdk/go-sdk/client/secret.go
Original file line number Diff line number Diff line change
@@ -1,18 +1,16 @@
/*
* Copyright 2021 Layotto Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
// Copyright 2021 Layotto Authors
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package client

import (
Expand Down

0 comments on commit d35ec1a

Please sign in to comment.