From fb5f56b4c300f6bf684432522d0d95d6cb530940 Mon Sep 17 00:00:00 2001 From: Mrproliu <741550557@qq.com> Date: Wed, 15 Nov 2023 12:41:55 +0800 Subject: [PATCH] Update release version and update CI GHA --- .github/workflows/create_release.yml | 2 +- .github/workflows/deploy.yml | 2 +- .github/workflows/docker_push.yml | 2 +- .github/workflows/helm_release.yml | 2 +- .github/workflows/helm_test.yml | 2 +- .github/workflows/readme_test.yml | 6 +- .github/workflows/test.yml | 106 +++++++++--------- benchmarks/pom.xml | 2 +- build-bin/git/version_from_trigger_tag | 2 +- pom.xml | 2 +- zipkin-lens/pom.xml | 2 +- zipkin-server/health-query-plugin/pom.xml | 2 +- zipkin-server/http-query-plugin/pom.xml | 2 +- zipkin-server/pom.xml | 2 +- zipkin-server/receiver-otlp-trace/pom.xml | 2 +- .../receiver-zipkin-activemq/pom.xml | 2 +- zipkin-server/receiver-zipkin-core/pom.xml | 2 +- zipkin-server/receiver-zipkin-grpc/pom.xml | 2 +- zipkin-server/receiver-zipkin-http/pom.xml | 2 +- zipkin-server/receiver-zipkin-kafka/pom.xml | 2 +- .../receiver-zipkin-rabbitmq/pom.xml | 2 +- zipkin-server/receiver-zipkin-scribe/pom.xml | 2 +- zipkin-server/server-core/pom.xml | 2 +- zipkin-server/server-starter/pom.xml | 2 +- zipkin-server/storage-cassandra/pom.xml | 2 +- zipkin-server/telemetry-zipkin/pom.xml | 2 +- zipkin-server/zipkin-dependency/pom.xml | 2 +- zipkin-server/zipkin-storage-ext/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../zipkin-dependency-storage-jdbc/pom.xml | 2 +- zipkin-tests/pom.xml | 2 +- zipkin/pom.xml | 2 +- 34 files changed, 90 insertions(+), 86 deletions(-) diff --git a/.github/workflows/create_release.yml b/.github/workflows/create_release.yml index 4e20472994b..f670c31f277 100644 --- a/.github/workflows/create_release.yml +++ b/.github/workflows/create_release.yml @@ -20,7 +20,7 @@ jobs: # the tag MAJOR.MINOR.PATCH event, but we still need to deploy the maven-release-plugin master commit. token: ${{ secrets.GH_TOKEN }} fetch-depth: 1 # only need the HEAD commit as license check isn't run - submodules: true + submodules: recursive - name: Cache local Maven repository uses: actions/cache@v2 with: diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 8b5fe603222..5f1fbd70f33 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -23,7 +23,7 @@ jobs: # We push Javadocs to the gh-pages branch on commit. token: ${{ secrets.GH_TOKEN }} fetch-depth: 0 # allow build-bin/idl_to_gh_pages to get the full history - submodules: true + submodules: recursive - name: Cache local Maven repository uses: actions/cache@v2 with: diff --git a/.github/workflows/docker_push.yml b/.github/workflows/docker_push.yml index 71d21c6b3b1..2be7f4a4b1f 100644 --- a/.github/workflows/docker_push.yml +++ b/.github/workflows/docker_push.yml @@ -17,7 +17,7 @@ jobs: uses: actions/checkout@v2 with: fetch-depth: 1 # only needed to get the sha label - submodules: true + submodules: recursive # We can't cache Docker without using buildx because GH actions restricts /var/lib/docker # That's ok because DOCKER_PARENT_IMAGE is always ghcr.io and local anyway. - name: Docker Push diff --git a/.github/workflows/helm_release.yml b/.github/workflows/helm_release.yml index 3a80465b014..212ce262800 100644 --- a/.github/workflows/helm_release.yml +++ b/.github/workflows/helm_release.yml @@ -15,7 +15,7 @@ jobs: - name: Checkout uses: actions/checkout@v1 with: - submodules: true + submodules: recursive - name: Configure Git run: | diff --git a/.github/workflows/helm_test.yml b/.github/workflows/helm_test.yml index dfa26fcb4e4..a749fb16514 100644 --- a/.github/workflows/helm_test.yml +++ b/.github/workflows/helm_test.yml @@ -17,7 +17,7 @@ jobs: - name: Checkout uses: actions/checkout@v1 with: - submodules: true + submodules: recursive - name: Configure Git run: | diff --git a/.github/workflows/readme_test.yml b/.github/workflows/readme_test.yml index 81948240e72..f7464fb0ad8 100644 --- a/.github/workflows/readme_test.yml +++ b/.github/workflows/readme_test.yml @@ -30,7 +30,7 @@ jobs: uses: actions/checkout@v2 with: fetch-depth: 1 - submodules: true + submodules: recursive # Setup latest JDK. We do this to ensure users don't need to use the same version as our # release process. Release uses JDK 11, the last version that can target 1.6 bytecode. - name: Setup java @@ -49,7 +49,7 @@ jobs: key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} restore-keys: ${{ runner.os }}-maven- - name: Execute Server Build # command from zipkin-server/README.md - run: ./mvnw -T1C -q --batch-mode -DskipTests --also-make -pl :zipkin-server clean package + run: ./mvnw -T1C -q --batch-mode -DskipTests -Dcheckstyle.skip=true --also-make -pl :zipkin-server clean package docker: runs-on: ubuntu-20.04 # newest available distribution, aka focal @@ -58,7 +58,7 @@ jobs: uses: actions/checkout@v2 with: fetch-depth: 1 - submodules: true + submodules: recursive # Remove apt repos that are known to break from time to time. # See https://github.com/actions/virtual-environments/issues/323 - name: Remove broken apt repos diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 8427d927349..dc50491efc9 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -19,54 +19,58 @@ on: - "charts/**" jobs: -# test: -# runs-on: ubuntu-20.04 # newest available distribution, aka focal -# if: "!contains(github.event.head_commit.message, 'maven-release-plugin')" -# steps: -# - name: Checkout Repository -# uses: actions/checkout@v2 -# with: -# fetch-depth: 0 # full git history for license check -# - name: Cache local Maven repository -# uses: actions/cache@v2 -# with: -# path: ~/.m2/repository -# key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} -# restore-keys: ${{ runner.os }}-maven- -# - name: Cache NPM Packages -# uses: actions/cache@v2 -# with: -# path: ~/.npm -# key: ${{ runner.os }}-npm-packages-${{ hashFiles('zipkin-lens/package-lock.json') }} -# - name: Test without Docker -# run: build-bin/maven_go_offline && build-bin/test -Ddocker.skip=true -# test_docker: -# runs-on: ubuntu-20.04 # newest available distribution, aka focal -# if: "!contains(github.event.head_commit.message, 'maven-release-plugin')" -# strategy: -# matrix: -# include: -# - name: zipkin-collector-kafka -# - name: zipkin-collector-rabbitmq -# - name: zipkin-storage-cassandra -# - name: zipkin-storage-elasticsearch -# - name: zipkin-storage-mysql-v1 -# steps: -# - name: Checkout Repository -# uses: actions/checkout@v2 -# with: -# fetch-depth: 1 # -Dlicense.skip=true so we don't need a full clone -# - name: Cache local Maven repository -# uses: actions/cache@v2 -# with: -# path: ~/.m2/repository -# key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} -# restore-keys: ${{ runner.os }}-maven- -# # We can't cache Docker without using buildx because GH actions restricts /var/lib/docker -# # That's ok because DOCKER_PARENT_IMAGE is always ghcr.io and local anyway. -# - name: Test with Docker -# run: -# | # configure_test seeds NPM cache, which isn't needed for these tests -# build-bin/maven/maven_go_offline && -# build-bin/docker/configure_docker && -# build-bin/test -pl :${{ matrix.name }} --am -Dlicense.skip=true + test: + runs-on: ubuntu-20.04 # newest available distribution, aka focal + if: "!contains(github.event.head_commit.message, 'maven-release-plugin')" + steps: + - name: Checkout Repository + uses: actions/checkout@v2 + with: + fetch-depth: 0 # full git history for license check + submodules: recursive + - name: Cache local Maven repository + uses: actions/cache@v2 + with: + path: ~/.m2/repository + key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} + restore-keys: ${{ runner.os }}-maven- + - name: Cache NPM Packages + uses: actions/cache@v2 + with: + path: ~/.npm + key: ${{ runner.os }}-npm-packages-${{ hashFiles('zipkin-lens/package-lock.json') }} + - name: Test without Docker + run: build-bin/maven_go_offline && build-bin/test -Ddocker.skip=true -Dcheckstyle.skip=true -DskipUTs=true -DexcludedGroups=slow + test_docker: + runs-on: ubuntu-20.04 # newest available distribution, aka focal + if: "!contains(github.event.head_commit.message, 'maven-release-plugin')" + strategy: + matrix: + include: + - name: receiver-zipkin-activemq + - name: receiver-zipkin-http + - name: receiver-zipkin-kafka + - name: receiver-zipkin-rabbitmq + - name: receiver-zipkin-scribe + - name: receiver-zipkin-grpc + - name: storage-cassandra + steps: + - name: Checkout Repository + uses: actions/checkout@v2 + with: + fetch-depth: 1 # -Dlicense.skip=true so we don't need a full clone + submodules: recursive + - name: Cache local Maven repository + uses: actions/cache@v2 + with: + path: ~/.m2/repository + key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} + restore-keys: ${{ runner.os }}-maven- + # We can't cache Docker without using buildx because GH actions restricts /var/lib/docker + # That's ok because DOCKER_PARENT_IMAGE is always ghcr.io and local anyway. + - name: Test with Docker + run: + | # configure_test seeds NPM cache, which isn't needed for these tests + build-bin/maven/maven_go_offline && + build-bin/docker/configure_docker && + build-bin/test -pl :${{ matrix.name }} --am -Dlicense.skip=true -Dcheckstyle.skip=true -DskipUTs=true -DexcludedGroups=slow \ No newline at end of file diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml index fdc6412e56c..7361d3d61bb 100644 --- a/benchmarks/pom.xml +++ b/benchmarks/pom.xml @@ -20,7 +20,7 @@ io.zipkin zipkin-parent - 2.24.4-SNAPSHOT + 3.0.0-SNAPSHOT benchmarks diff --git a/build-bin/git/version_from_trigger_tag b/build-bin/git/version_from_trigger_tag index 2ddb7c49c1c..2052dab153a 100755 --- a/build-bin/git/version_from_trigger_tag +++ b/build-bin/git/version_from_trigger_tag @@ -27,7 +27,7 @@ trigger_tag_prefix=${1?required. Ex docker- to match docker-1.2.3} trigger_tag=${2?trigger_tag is required. Ex ${trigger_tag_prefix}1.2.3} # Checking sed output to determine success as exit code handling in sed or awk is awkward -version=$(echo "${trigger_tag}" | sed -En "s/^${trigger_tag_prefix}([0-9]+\.[0-9]+\.[0-9]+)$/\1/p") +version=$(echo "${trigger_tag}" | sed -En "s/^${trigger_tag_prefix}([0-9]+\.[0-9]+\.[0-9]+(\-rc[0-9]+))$/\1/p") if [ -z "$version" ]; then >&2 echo invalid trigger tag: ${trigger_tag} diff --git a/pom.xml b/pom.xml index a2145b1a2bd..dca8c13a1f1 100755 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ io.zipkin zipkin-parent - 2.24.4-SNAPSHOT + 3.0.0-SNAPSHOT pom diff --git a/zipkin-lens/pom.xml b/zipkin-lens/pom.xml index c33adc329e9..5967a740580 100644 --- a/zipkin-lens/pom.xml +++ b/zipkin-lens/pom.xml @@ -20,7 +20,7 @@ io.zipkin zipkin-parent - 2.24.4-SNAPSHOT + 3.0.0-SNAPSHOT zipkin-lens diff --git a/zipkin-server/health-query-plugin/pom.xml b/zipkin-server/health-query-plugin/pom.xml index d16e9add651..3b05d653b8a 100644 --- a/zipkin-server/health-query-plugin/pom.xml +++ b/zipkin-server/health-query-plugin/pom.xml @@ -6,7 +6,7 @@ zipkin-server-parent io.zipkin - 2.24.4-SNAPSHOT + 3.0.0-SNAPSHOT health-query-plugin diff --git a/zipkin-server/http-query-plugin/pom.xml b/zipkin-server/http-query-plugin/pom.xml index 43db33e1803..b855c09a171 100644 --- a/zipkin-server/http-query-plugin/pom.xml +++ b/zipkin-server/http-query-plugin/pom.xml @@ -6,7 +6,7 @@ zipkin-server-parent io.zipkin - 2.24.4-SNAPSHOT + 3.0.0-SNAPSHOT http-query-plugin diff --git a/zipkin-server/pom.xml b/zipkin-server/pom.xml index 91a38c4d363..b7df96bdf4f 100644 --- a/zipkin-server/pom.xml +++ b/zipkin-server/pom.xml @@ -20,7 +20,7 @@ io.zipkin zipkin-parent - 2.24.4-SNAPSHOT + 3.0.0-SNAPSHOT zipkin-server-parent diff --git a/zipkin-server/receiver-otlp-trace/pom.xml b/zipkin-server/receiver-otlp-trace/pom.xml index 02219d319d9..084c4d5faa8 100644 --- a/zipkin-server/receiver-otlp-trace/pom.xml +++ b/zipkin-server/receiver-otlp-trace/pom.xml @@ -6,7 +6,7 @@ zipkin-server-parent io.zipkin - 2.24.4-SNAPSHOT + 3.0.0-SNAPSHOT receiver-otlp-trace diff --git a/zipkin-server/receiver-zipkin-activemq/pom.xml b/zipkin-server/receiver-zipkin-activemq/pom.xml index 2dda22ee0ea..510fa2c20c9 100644 --- a/zipkin-server/receiver-zipkin-activemq/pom.xml +++ b/zipkin-server/receiver-zipkin-activemq/pom.xml @@ -6,7 +6,7 @@ zipkin-server-parent io.zipkin - 2.24.4-SNAPSHOT + 3.0.0-SNAPSHOT receiver-zipkin-activemq diff --git a/zipkin-server/receiver-zipkin-core/pom.xml b/zipkin-server/receiver-zipkin-core/pom.xml index 00fed3985fd..7dce0ae0c4f 100644 --- a/zipkin-server/receiver-zipkin-core/pom.xml +++ b/zipkin-server/receiver-zipkin-core/pom.xml @@ -6,7 +6,7 @@ zipkin-server-parent io.zipkin - 2.24.4-SNAPSHOT + 3.0.0-SNAPSHOT receiver-zipkin-core diff --git a/zipkin-server/receiver-zipkin-grpc/pom.xml b/zipkin-server/receiver-zipkin-grpc/pom.xml index 091ca492757..250bc08abd2 100644 --- a/zipkin-server/receiver-zipkin-grpc/pom.xml +++ b/zipkin-server/receiver-zipkin-grpc/pom.xml @@ -6,7 +6,7 @@ zipkin-server-parent io.zipkin - 2.24.4-SNAPSHOT + 3.0.0-SNAPSHOT receiver-zipkin-grpc diff --git a/zipkin-server/receiver-zipkin-http/pom.xml b/zipkin-server/receiver-zipkin-http/pom.xml index bf32ec7294d..b7c4c38273d 100644 --- a/zipkin-server/receiver-zipkin-http/pom.xml +++ b/zipkin-server/receiver-zipkin-http/pom.xml @@ -6,7 +6,7 @@ zipkin-server-parent io.zipkin - 2.24.4-SNAPSHOT + 3.0.0-SNAPSHOT receiver-zipkin-http diff --git a/zipkin-server/receiver-zipkin-kafka/pom.xml b/zipkin-server/receiver-zipkin-kafka/pom.xml index a8968153150..1727a2d00ad 100644 --- a/zipkin-server/receiver-zipkin-kafka/pom.xml +++ b/zipkin-server/receiver-zipkin-kafka/pom.xml @@ -6,7 +6,7 @@ zipkin-server-parent io.zipkin - 2.24.4-SNAPSHOT + 3.0.0-SNAPSHOT receiver-zipkin-kafka diff --git a/zipkin-server/receiver-zipkin-rabbitmq/pom.xml b/zipkin-server/receiver-zipkin-rabbitmq/pom.xml index ec2933ee564..c2d8a77fa3e 100644 --- a/zipkin-server/receiver-zipkin-rabbitmq/pom.xml +++ b/zipkin-server/receiver-zipkin-rabbitmq/pom.xml @@ -6,7 +6,7 @@ zipkin-server-parent io.zipkin - 2.24.4-SNAPSHOT + 3.0.0-SNAPSHOT receiver-zipkin-rabbitmq diff --git a/zipkin-server/receiver-zipkin-scribe/pom.xml b/zipkin-server/receiver-zipkin-scribe/pom.xml index 8c6422c9db8..4c75bc0bbf4 100644 --- a/zipkin-server/receiver-zipkin-scribe/pom.xml +++ b/zipkin-server/receiver-zipkin-scribe/pom.xml @@ -6,7 +6,7 @@ zipkin-server-parent io.zipkin - 2.24.4-SNAPSHOT + 3.0.0-SNAPSHOT receiver-zipkin-scribe diff --git a/zipkin-server/server-core/pom.xml b/zipkin-server/server-core/pom.xml index 32e2b5ca570..c724e8db797 100644 --- a/zipkin-server/server-core/pom.xml +++ b/zipkin-server/server-core/pom.xml @@ -7,7 +7,7 @@ zipkin-server-parent io.zipkin - 2.24.4-SNAPSHOT + 3.0.0-SNAPSHOT zipkin-server-core diff --git a/zipkin-server/server-starter/pom.xml b/zipkin-server/server-starter/pom.xml index fe66380c289..aeca1c404d2 100644 --- a/zipkin-server/server-starter/pom.xml +++ b/zipkin-server/server-starter/pom.xml @@ -7,7 +7,7 @@ zipkin-server-parent io.zipkin - 2.24.4-SNAPSHOT + 3.0.0-SNAPSHOT zipkin-server diff --git a/zipkin-server/storage-cassandra/pom.xml b/zipkin-server/storage-cassandra/pom.xml index e7c53188b5f..ef02f2fef18 100644 --- a/zipkin-server/storage-cassandra/pom.xml +++ b/zipkin-server/storage-cassandra/pom.xml @@ -7,7 +7,7 @@ zipkin-server-parent io.zipkin - 2.24.4-SNAPSHOT + 3.0.0-SNAPSHOT storage-cassandra diff --git a/zipkin-server/telemetry-zipkin/pom.xml b/zipkin-server/telemetry-zipkin/pom.xml index cf74731f909..52ff6c86f64 100644 --- a/zipkin-server/telemetry-zipkin/pom.xml +++ b/zipkin-server/telemetry-zipkin/pom.xml @@ -6,7 +6,7 @@ zipkin-server-parent io.zipkin - 2.24.4-SNAPSHOT + 3.0.0-SNAPSHOT Telemetry Zipkin diff --git a/zipkin-server/zipkin-dependency/pom.xml b/zipkin-server/zipkin-dependency/pom.xml index 5eb2c4d7879..09a3afd8c60 100644 --- a/zipkin-server/zipkin-dependency/pom.xml +++ b/zipkin-server/zipkin-dependency/pom.xml @@ -6,7 +6,7 @@ zipkin-server-parent io.zipkin - 2.24.4-SNAPSHOT + 3.0.0-SNAPSHOT zipkin-dependency diff --git a/zipkin-server/zipkin-storage-ext/pom.xml b/zipkin-server/zipkin-storage-ext/pom.xml index 2a28a6d637e..9529f0e52b5 100644 --- a/zipkin-server/zipkin-storage-ext/pom.xml +++ b/zipkin-server/zipkin-storage-ext/pom.xml @@ -7,7 +7,7 @@ zipkin-server-parent io.zipkin - 2.24.4-SNAPSHOT + 3.0.0-SNAPSHOT zipkin-storage-ext diff --git a/zipkin-server/zipkin-storage-ext/zipkin-dependency-storage-banyandb/pom.xml b/zipkin-server/zipkin-storage-ext/zipkin-dependency-storage-banyandb/pom.xml index 17f0c460bbc..d92604f60a1 100644 --- a/zipkin-server/zipkin-storage-ext/zipkin-dependency-storage-banyandb/pom.xml +++ b/zipkin-server/zipkin-storage-ext/zipkin-dependency-storage-banyandb/pom.xml @@ -6,7 +6,7 @@ zipkin-storage-ext io.zipkin - 2.24.4-SNAPSHOT + 3.0.0-SNAPSHOT zipkin-dependency-storage-banyandb diff --git a/zipkin-server/zipkin-storage-ext/zipkin-dependency-storage-cassandra/pom.xml b/zipkin-server/zipkin-storage-ext/zipkin-dependency-storage-cassandra/pom.xml index 608e090ce3d..d05b93318d8 100644 --- a/zipkin-server/zipkin-storage-ext/zipkin-dependency-storage-cassandra/pom.xml +++ b/zipkin-server/zipkin-storage-ext/zipkin-dependency-storage-cassandra/pom.xml @@ -5,7 +5,7 @@ zipkin-storage-ext io.zipkin - 2.24.4-SNAPSHOT + 3.0.0-SNAPSHOT 4.0.0 diff --git a/zipkin-server/zipkin-storage-ext/zipkin-dependency-storage-elasticsearch/pom.xml b/zipkin-server/zipkin-storage-ext/zipkin-dependency-storage-elasticsearch/pom.xml index 18589f758b8..33f2c3959fe 100644 --- a/zipkin-server/zipkin-storage-ext/zipkin-dependency-storage-elasticsearch/pom.xml +++ b/zipkin-server/zipkin-storage-ext/zipkin-dependency-storage-elasticsearch/pom.xml @@ -5,7 +5,7 @@ zipkin-storage-ext io.zipkin - 2.24.4-SNAPSHOT + 3.0.0-SNAPSHOT 4.0.0 diff --git a/zipkin-server/zipkin-storage-ext/zipkin-dependency-storage-jdbc/pom.xml b/zipkin-server/zipkin-storage-ext/zipkin-dependency-storage-jdbc/pom.xml index 5cc241a35a3..5149028f3c4 100644 --- a/zipkin-server/zipkin-storage-ext/zipkin-dependency-storage-jdbc/pom.xml +++ b/zipkin-server/zipkin-storage-ext/zipkin-dependency-storage-jdbc/pom.xml @@ -5,7 +5,7 @@ zipkin-storage-ext io.zipkin - 2.24.4-SNAPSHOT + 3.0.0-SNAPSHOT 4.0.0 diff --git a/zipkin-tests/pom.xml b/zipkin-tests/pom.xml index 8a5df8a2368..8bdbe9caeb1 100644 --- a/zipkin-tests/pom.xml +++ b/zipkin-tests/pom.xml @@ -20,7 +20,7 @@ io.zipkin zipkin-parent - 2.24.4-SNAPSHOT + 3.0.0-SNAPSHOT io.zipkin.zipkin2 diff --git a/zipkin/pom.xml b/zipkin/pom.xml index b6d682023ff..b9f86dc8b2a 100644 --- a/zipkin/pom.xml +++ b/zipkin/pom.xml @@ -20,7 +20,7 @@ io.zipkin zipkin-parent - 2.24.4-SNAPSHOT + 3.0.0-SNAPSHOT io.zipkin.zipkin2