From 66f8046f5ee153013f7eb48190f198bdb3ff3dba Mon Sep 17 00:00:00 2001 From: eeliu <27064129+eeliu@users.noreply.github.com> Date: Thu, 10 Oct 2024 15:12:23 +0800 Subject: [PATCH] fix doc and workflows --- .github/workflows/publish-collector-agent.yml | 10 +++++----- .gitignore | 3 ++- collector-agent/1.cap | Bin 693 -> 0 bytes collector-agent/makefile | 2 +- common/CHANGES.md | 2 +- common/readme.md | 2 +- 6 files changed, 10 insertions(+), 9 deletions(-) delete mode 100644 collector-agent/1.cap diff --git a/.github/workflows/publish-collector-agent.yml b/.github/workflows/publish-collector-agent.yml index 5720b459..f6eb97b7 100644 --- a/.github/workflows/publish-collector-agent.yml +++ b/.github/workflows/publish-collector-agent.yml @@ -3,6 +3,7 @@ name: publish-collector-agent on: release: types: [created] + workflow_dispatch: permissions: contents: write @@ -10,7 +11,7 @@ permissions: env: REGISTRY_IMAGE: ghcr.io/${{ github.repository }}/collector-agent - TAG_NAME: ${{ github.head_ref || github.ref_name }} + TAG_NAME: v0.7 jobs: collector-agent: @@ -58,10 +59,8 @@ jobs: with: context: collector-agent platforms: ${{ matrix.platform }} - # tags: | - # ghcr.io/${{ github.repository }}/collector-agent:${{ inputs.tag }} - # ghcr.io/${{ github.repository }}/collector-agent:latest github-token: ${{ secrets.GITHUB_TOKEN }} + tags: ${{ env.TAG_NAME }} labels: ${{ steps.meta.outputs.labels }} outputs: type=image,name=${{ env.REGISTRY_IMAGE }},push-by-digest=true,name-canonical=true,push=true @@ -119,6 +118,7 @@ jobs: Release-Collector-agent: runs-on: ubuntu-latest + if: github.event_name == 'release' strategy: matrix: # build and publish in parallel: linux/386, linux/amd64, linux/arm64, windows/386, windows/amd64, darwin/amd64, darwin/arm64 @@ -132,7 +132,7 @@ jobs: id: release-ca with: github_token: ${{ secrets.GITHUB_TOKEN }} - goversion: "https://dl.google.com/go/go1.18.10.linux-amd64.tar.gz" + goversion: 1.19 goos: ${{ matrix.goos }} goarch: ${{ matrix.goarch }} project_path: "collector-agent" diff --git a/.gitignore b/.gitignore index 50e51cc3..505fa967 100644 --- a/.gitignore +++ b/.gitignore @@ -84,4 +84,5 @@ x86 output config.nice.bat configure.bat -configure.js \ No newline at end of file +configure.js +*.cap \ No newline at end of file diff --git a/collector-agent/1.cap b/collector-agent/1.cap deleted file mode 100644 index bfd93f5b592ce09a980d822e3e84dccff1fa4bc5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 693 zcmca|c+)~A1{MYcU}0bcaw6Q=((ed!GI#;mAdCz+7+e_`Y_=#mFgUPv%&2EzU0e;VCnkm)d!zXMHn0@?(^$N=nSlPyYMH_wNe40UrH(DbGT0Valj z8bCKPLfi{7735Y%aZZMbK%+ny8Gub}&U*tg@oXE+M5tSvKyGc20Ge11H}NAZ6o96< zS1TnJ6lA6-St;e^E9rnZd5O8HFm6dEm~CioWMN`vVq$J&YH12oRhC**oSB~oR8?l6 zXQpSOR10#TG|+)~ysQlN@;sOWk-U5n&C4JMevAg1sQ8l^kBND2!Ct-sGZE_Li(oGc gA_rnZ6wE{`ye4i@0lRT7%tRzNUTP3QH!&d!0Flp?ApigX diff --git a/collector-agent/makefile b/collector-agent/makefile index 34fe96a5..9b4cb0ea 100644 --- a/collector-agent/makefile +++ b/collector-agent/makefile @@ -1,5 +1,5 @@ -TAG ?=v0.6.4 +TAG ?=v0.7 .PHONY: default default: server ; diff --git a/common/CHANGES.md b/common/CHANGES.md index 96b3ebee..7fdfa940 100644 --- a/common/CHANGES.md +++ b/common/CHANGES.md @@ -1,4 +1,4 @@ -## v0.6.0 +## v0.6.0 2024-10-10 - refactor span json protocol - add async api - data structure change: multiple map to list diff --git a/common/readme.md b/common/readme.md index 67961361..8aa81a45 100644 --- a/common/readme.md +++ b/common/readme.md @@ -4,6 +4,6 @@ ```shell $ cmake -DWITH_TEST_CASE=1 -DWITH_CODECOVERAGE=1 -DCMAKE_BUILD_TYPE=Debug .. -$ ./bin/TestCommon --gtest_filter=node.wakeTrace +$ ./bin/TestCommon ```