From 689297e14d70d4bc7570282fd270d54f9e53d15b Mon Sep 17 00:00:00 2001 From: LinkinStars Date: Mon, 27 Mar 2023 13:34:18 +0800 Subject: [PATCH 1/6] docs(makefile): upgrade 1.1.0 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 1f44f3b9..ce3d42c8 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ .PHONY: build clean ui -VERSION=1.0.7 +VERSION=1.1.0 BIN=answer DIR_SRC=./cmd/answer DOCKER_CMD=docker From 072bf002c29afcc478dd96b2069569bfa17a8c12 Mon Sep 17 00:00:00 2001 From: LinkinStars Date: Mon, 27 Mar 2023 13:37:32 +0800 Subject: [PATCH 2/6] chore(plugin): remove sample --- plugin/sample/connector.go | 20 -------------------- plugin/sample/connector_test.go | 26 -------------------------- 2 files changed, 46 deletions(-) delete mode 100644 plugin/sample/connector.go delete mode 100644 plugin/sample/connector_test.go diff --git a/plugin/sample/connector.go b/plugin/sample/connector.go deleted file mode 100644 index 55d4bfec..00000000 --- a/plugin/sample/connector.go +++ /dev/null @@ -1,20 +0,0 @@ -package sample - -import "github.com/answerdev/answer/plugin" - -type Connector struct { -} - -func init() { - plugin.Register(&Connector{}) -} - -func (c *Connector) Info() plugin.Info { - return plugin.Info{ - Name: plugin.MakeTranslator("plugin.connector.name"), - SlugName: "connector", - //Description: plugin.MakeTranslator("plugin.connector.description"), - Author: "answerdev", - Version: "0.0.1", - } -} diff --git a/plugin/sample/connector_test.go b/plugin/sample/connector_test.go deleted file mode 100644 index 43cff4ed..00000000 --- a/plugin/sample/connector_test.go +++ /dev/null @@ -1,26 +0,0 @@ -package sample - -import ( - "fmt" - "net/http" - "net/http/httptest" - "testing" - - "github.com/answerdev/answer/plugin" - "github.com/gin-gonic/gin" -) - -func TestConnector_Info(t *testing.T) { - c, _ := gin.CreateTestContext(httptest.NewRecorder()) - c.Request, _ = http.NewRequest("", "", nil) - c.Request.Header.Set("Accept-Language", "en_US") - _ = plugin.CallBase(func(base plugin.Base) error { - info := base.Info() - fmt.Println(info.Name.Translate(c)) - fmt.Println(info.SlugName) - fmt.Println(info.Description.Translate(c)) - fmt.Println(info.Author) - fmt.Println(info.Version) - return nil - }) -} From c976b79bfd0d60c713a33ff5459b6ee090d9f388 Mon Sep 17 00:00:00 2001 From: LinkinStars Date: Mon, 27 Mar 2023 14:43:17 +0800 Subject: [PATCH 3/6] feat(build): merge build script from feature plugin --- Dockerfile | 8 +++++--- script/build_plugin.sh | 31 +++++++++++++++++++++++++++++++ script/plugin_list | 1 + 3 files changed, 37 insertions(+), 3 deletions(-) create mode 100644 script/build_plugin.sh create mode 100644 script/plugin_list diff --git a/Dockerfile b/Dockerfile index c1bd53ba..2610e040 100644 --- a/Dockerfile +++ b/Dockerfile @@ -25,9 +25,11 @@ ARG CGO_EXTRA_CFLAGS COPY . ${BUILD_DIR} WORKDIR ${BUILD_DIR} COPY --from=node-builder /tmp/build ${BUILD_DIR}/ui/build -RUN apk --no-cache add build-base git \ - && make clean build \ - && cp answer /usr/bin/answer +RUN apk --no-cache add build-base git bash \ + && make clean build +RUN chmod 755 answer +RUN ["/bin/bash","-c","script/build_plugin.sh"] +RUN cp answer /usr/bin/answer RUN mkdir -p /data/uploads && chmod 777 /data/uploads \ && mkdir -p /data/i18n && cp -r i18n/*.yaml /data/i18n diff --git a/script/build_plugin.sh b/script/build_plugin.sh new file mode 100644 index 00000000..010a477e --- /dev/null +++ b/script/build_plugin.sh @@ -0,0 +1,31 @@ +#!/bin/bash +plugin_file=./script/plugin_list +if [ ! -f "$plugin_file" ]; then + echo "plugin_list is not exist" + exit 0 +fi +num=0 +for line in `cat $plugin_file` +do + account=$line + accounts[$num]=$account + ((num++)) +done +if [ $num -eq 0 ]; then + echo "plugin_list is null" + exit 0 +fi +cmd="./answer build " +for repo in ${accounts[@]} +do +echo ${repo} +cmd=$cmd" --with "${repo} +done +$cmd +if [ ! -f "./new_answer" ]; then + echo "new_answer is not exist build failed" + exit 0 +fi +rm answer +mv new_answer answer +./answer plugin \ No newline at end of file diff --git a/script/plugin_list b/script/plugin_list new file mode 100644 index 00000000..a7cfc670 --- /dev/null +++ b/script/plugin_list @@ -0,0 +1 @@ +github.com/answerdev/plugins/connector/basic@latest \ No newline at end of file From ad20a8ff1f3f56980c01210815328c8eaaefdca3 Mon Sep 17 00:00:00 2001 From: aichy126 <16996097+aichy126@users.noreply.github.com> Date: Mon, 27 Mar 2023 17:04:47 +0800 Subject: [PATCH 4/6] go mod add replace --- go.mod | 2 ++ 1 file changed, 2 insertions(+) diff --git a/go.mod b/go.mod index 4007f17c..20d6c471 100644 --- a/go.mod +++ b/go.mod @@ -141,3 +141,5 @@ require ( modernc.org/token v1.0.0 // indirect sigs.k8s.io/yaml v1.3.0 // indirect ) + +replace lukechampine.com/uint128 v1.1.1 => github.com/aichy126/uint128 v1.1.1 From 2abc09617689afa1bc341fc886976b67e7c0868b Mon Sep 17 00:00:00 2001 From: aichy126 <16996097+aichy126@users.noreply.github.com> Date: Mon, 27 Mar 2023 17:28:26 +0800 Subject: [PATCH 5/6] update script --- script/{build_plugin.sh => build_plugin.sh.bk} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename script/{build_plugin.sh => build_plugin.sh.bk} (100%) mode change 100644 => 100755 diff --git a/script/build_plugin.sh b/script/build_plugin.sh.bk old mode 100644 new mode 100755 similarity index 100% rename from script/build_plugin.sh rename to script/build_plugin.sh.bk From 4de996ed07516ae4dc0a2e605c77ff37dc65c3a0 Mon Sep 17 00:00:00 2001 From: aichy126 <16996097+aichy126@users.noreply.github.com> Date: Mon, 27 Mar 2023 17:28:51 +0800 Subject: [PATCH 6/6] update script --- script/{build_plugin.sh.bk => build_plugin.sh} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename script/{build_plugin.sh.bk => build_plugin.sh} (100%) diff --git a/script/build_plugin.sh.bk b/script/build_plugin.sh similarity index 100% rename from script/build_plugin.sh.bk rename to script/build_plugin.sh