From 5306385e6bdae1e635cfde12ef16e950cc073e76 Mon Sep 17 00:00:00 2001 From: Kent Dong Date: Fri, 12 Jul 2024 14:23:12 +0800 Subject: [PATCH] feat: Support loading custom parameters in build-and-push-wasm-plugin-image.yaml (#1118) --- .../build-and-push-wasm-plugin-image.yaml | 16 +++++++++++++--- plugins/wasm-go/extensions/ai-cache/.buildrc | 1 + plugins/wasm-go/extensions/ai-proxy/.buildrc | 1 + .../extensions/ai-security-guard/.buildrc | 1 + .../wasm-go/extensions/ai-transformer/.buildrc | 1 + plugins/wasm-go/extensions/transformer/.buildrc | 1 + 6 files changed, 18 insertions(+), 3 deletions(-) create mode 100644 plugins/wasm-go/extensions/ai-cache/.buildrc create mode 100644 plugins/wasm-go/extensions/ai-proxy/.buildrc create mode 100644 plugins/wasm-go/extensions/ai-security-guard/.buildrc create mode 100644 plugins/wasm-go/extensions/ai-transformer/.buildrc create mode 100644 plugins/wasm-go/extensions/transformer/.buildrc diff --git a/.github/workflows/build-and-push-wasm-plugin-image.yaml b/.github/workflows/build-and-push-wasm-plugin-image.yaml index ec9084bf1..d716d5e39 100644 --- a/.github/workflows/build-and-push-wasm-plugin-image.yaml +++ b/.github/workflows/build-and-push-wasm-plugin-image.yaml @@ -21,8 +21,8 @@ jobs: environment: name: image-registry-msg env: - IMAGE_REGISTRY_SERVICE: ${{ vars.IMAGE_REGISTRY_SERVICE || 'higress-registry.cn-hangzhou.cr.aliyuncs.com' }} - IMAGE_REPOSITORY: ${{ vars.IMAGE_REPOSITORY || 'plugins' }} + IMAGE_REGISTRY_SERVICE: ${{ vars.IMAGE_REGISTRY || 'higress-registry.cn-hangzhou.cr.aliyuncs.com' }} + IMAGE_REPOSITORY: ${{ vars.PLUGIN_IMAGE_REPOSITORY || 'plugins' }} GO_VERSION: 1.19 TINYGO_VERSION: 0.28.1 ORAS_VERSION: 1.0.0 @@ -91,10 +91,20 @@ jobs: target_image="${{ env.IMAGE_REGISTRY_SERVICE }}/${{ env.IMAGE_REPOSITORY}}/${{ env.PLUGIN_NAME }}:${{ env.VERSION }}" echo "TargetImage=${target_image}" + cd ${{ github.workspace }}/plugins/wasm-go/extensions/${PLUGIN_NAME} + if [ -f ./.buildrc ]; then + echo 'Found .buildrc file, sourcing it...' + . ./.buildrc + else + echo '.buildrc file not found' + fi + echo "EXTRA_TAGS=${EXTRA_TAGS}" + command=" + set -e cd /workspace/plugins/wasm-go/extensions/${PLUGIN_NAME} go mod tidy - tinygo build -o ./plugin.wasm -scheduler=none -target=wasi -gc=custom -tags='custommalloc nottinygc_finalizer' . + tinygo build -o ./plugin.wasm -scheduler=none -target=wasi -gc=custom -tags=\"custommalloc nottinygc_finalizer ${EXTRA_TAGS}\" . tar czvf plugin.tar.gz plugin.wasm echo ${{ secrets.REGISTRY_PASSWORD }} | oras login -u ${{ secrets.REGISTRY_USERNAME }} --password-stdin ${{ env.IMAGE_REGISTRY_SERVICE }} oras push ${target_image} ${push_command} diff --git a/plugins/wasm-go/extensions/ai-cache/.buildrc b/plugins/wasm-go/extensions/ai-cache/.buildrc new file mode 100644 index 000000000..f76a2883a --- /dev/null +++ b/plugins/wasm-go/extensions/ai-cache/.buildrc @@ -0,0 +1 @@ +EXTRA_TAGS=proxy_wasm_version_0_2_100 \ No newline at end of file diff --git a/plugins/wasm-go/extensions/ai-proxy/.buildrc b/plugins/wasm-go/extensions/ai-proxy/.buildrc new file mode 100644 index 000000000..f76a2883a --- /dev/null +++ b/plugins/wasm-go/extensions/ai-proxy/.buildrc @@ -0,0 +1 @@ +EXTRA_TAGS=proxy_wasm_version_0_2_100 \ No newline at end of file diff --git a/plugins/wasm-go/extensions/ai-security-guard/.buildrc b/plugins/wasm-go/extensions/ai-security-guard/.buildrc new file mode 100644 index 000000000..f76a2883a --- /dev/null +++ b/plugins/wasm-go/extensions/ai-security-guard/.buildrc @@ -0,0 +1 @@ +EXTRA_TAGS=proxy_wasm_version_0_2_100 \ No newline at end of file diff --git a/plugins/wasm-go/extensions/ai-transformer/.buildrc b/plugins/wasm-go/extensions/ai-transformer/.buildrc new file mode 100644 index 000000000..f76a2883a --- /dev/null +++ b/plugins/wasm-go/extensions/ai-transformer/.buildrc @@ -0,0 +1 @@ +EXTRA_TAGS=proxy_wasm_version_0_2_100 \ No newline at end of file diff --git a/plugins/wasm-go/extensions/transformer/.buildrc b/plugins/wasm-go/extensions/transformer/.buildrc new file mode 100644 index 000000000..f76a2883a --- /dev/null +++ b/plugins/wasm-go/extensions/transformer/.buildrc @@ -0,0 +1 @@ +EXTRA_TAGS=proxy_wasm_version_0_2_100 \ No newline at end of file