From c4ad854734449c9025aedac0a96a276b53b752dd Mon Sep 17 00:00:00 2001 From: Kagaya Date: Mon, 23 Aug 2021 18:59:12 +0800 Subject: [PATCH 1/5] add ci filter --- .github/workflows/plugin_test.yaml | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/.github/workflows/plugin_test.yaml b/.github/workflows/plugin_test.yaml index 4d57c96..b4657fd 100644 --- a/.github/workflows/plugin_test.yaml +++ b/.github/workflows/plugin_test.yaml @@ -23,21 +23,32 @@ on: - master jobs: + Changes: + runs-on: ubuntu-latest + outputs: + e2e_file: ${{ steps.filter.outputs.changes }} + steps: + - uses: dorny/paths-filter@v2 + id: filter + with: + filters: | + gear/test/gear_plugin_test.yaml: gear + gin/v2/test/gin_plugin_test.yaml: gin/v2 + gin/v3/test/gin_plugin_test.yaml: gin/v3 + go-restful/test/go_restful_plugin_test.yaml: go-restful + micro/test/go_micro_plugin_test.yaml: micro + resty/test/go_resty_plugin_test.yaml: resty + kratos/test/go_kratos_plugin_test.yaml: kratos + PluginsTest: name: Plugin + needs: Changes runs-on: ubuntu-latest strategy: matrix: - case: - - { name: 'Gear', e2e_file: 'gear/test/gear_plugin_test.yaml' } - - { name: 'Gin v2', e2e_file: 'gin/v2/test/gin_plugin_test.yaml' } - - { name: 'Gin v3', e2e_file: 'gin/v3/test/gin_plugin_test.yaml' } - - { name: 'Go Restful', e2e_file: 'go-restful/test/go_restful_plugin_test.yaml' } - - { name: 'Go Micro', e2e_file: 'micro/test/go_micro_plugin_test.yaml' } - - { name: 'Go Resty', e2e_file: 'resty/test/go_resty_plugin_test.yaml' } - - { name: 'Go Kratos', e2e_file: 'kratos/test/go_kratos_plugin_test.yaml'} + e2e_file: ${{ fromJSON(needs.Changes.outputs.e2e_file) }} steps: - uses: actions/checkout@v2 - uses: apache/skywalking-infra-e2e@main with: - e2e-file: ${{ matrix.case.e2e_file }} \ No newline at end of file + e2e-file: ${{ matrix.e2e_file }} From a2533675bedc4ce4334ce2a95c9a61d73d097cae Mon Sep 17 00:00:00 2001 From: Kagaya Date: Mon, 23 Aug 2021 19:13:11 +0800 Subject: [PATCH 2/5] update --- .github/workflows/plugin_test.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/plugin_test.yaml b/.github/workflows/plugin_test.yaml index b4657fd..029b3f7 100644 --- a/.github/workflows/plugin_test.yaml +++ b/.github/workflows/plugin_test.yaml @@ -21,6 +21,7 @@ on: push: branches: - master + - main jobs: Changes: @@ -32,6 +33,7 @@ jobs: id: filter with: filters: | + # e2e_file path: plugin path gear/test/gear_plugin_test.yaml: gear gin/v2/test/gin_plugin_test.yaml: gin/v2 gin/v3/test/gin_plugin_test.yaml: gin/v3 From 581bb3d4c7261f2f6d0fa2723db35559bc20297f Mon Sep 17 00:00:00 2001 From: Kagaya Date: Mon, 23 Aug 2021 19:29:31 +0800 Subject: [PATCH 3/5] update --- .github/workflows/plugin_test.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/plugin_test.yaml b/.github/workflows/plugin_test.yaml index 029b3f7..633b375 100644 --- a/.github/workflows/plugin_test.yaml +++ b/.github/workflows/plugin_test.yaml @@ -34,13 +34,13 @@ jobs: with: filters: | # e2e_file path: plugin path - gear/test/gear_plugin_test.yaml: gear - gin/v2/test/gin_plugin_test.yaml: gin/v2 - gin/v3/test/gin_plugin_test.yaml: gin/v3 - go-restful/test/go_restful_plugin_test.yaml: go-restful - micro/test/go_micro_plugin_test.yaml: micro - resty/test/go_resty_plugin_test.yaml: resty - kratos/test/go_kratos_plugin_test.yaml: kratos + gear/test/gear_plugin_test.yaml: gear/** + gin/v2/test/gin_plugin_test.yaml: gin/v2/** + gin/v3/test/gin_plugin_test.yaml: gin/v3/** + go-restful/test/go_restful_plugin_test.yaml: go-restful/** + micro/test/go_micro_plugin_test.yaml: micro/** + resty/test/go_resty_plugin_test.yaml: resty/** + kratos/test/go_kratos_plugin_test.yaml: kratos/** PluginsTest: name: Plugin From 83f446fcd8b421e10c13d42aca74e29f25d08d59 Mon Sep 17 00:00:00 2001 From: Kagaya Date: Mon, 23 Aug 2021 21:27:19 +0800 Subject: [PATCH 4/5] update --- .github/workflows/plugin_test.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/plugin_test.yaml b/.github/workflows/plugin_test.yaml index 633b375..e75c150 100644 --- a/.github/workflows/plugin_test.yaml +++ b/.github/workflows/plugin_test.yaml @@ -21,7 +21,6 @@ on: push: branches: - master - - main jobs: Changes: From d12c79ca9b389a3cf1d83903d208352745ec40f8 Mon Sep 17 00:00:00 2001 From: Kagaya Date: Mon, 23 Aug 2021 21:32:53 +0800 Subject: [PATCH 5/5] add sql path --- .github/workflows/plugin_test.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/plugin_test.yaml b/.github/workflows/plugin_test.yaml index e75c150..404ac5c 100644 --- a/.github/workflows/plugin_test.yaml +++ b/.github/workflows/plugin_test.yaml @@ -40,6 +40,7 @@ jobs: micro/test/go_micro_plugin_test.yaml: micro/** resty/test/go_resty_plugin_test.yaml: resty/** kratos/test/go_kratos_plugin_test.yaml: kratos/** + sql/test/sql_plugin_test.yaml: sql/** PluginsTest: name: Plugin