Skip to content

Commit

Permalink
Update release version and update CI GHA
Browse files Browse the repository at this point in the history
  • Loading branch information
mrproliu committed Nov 15, 2023
1 parent 062d493 commit fb5f56b
Show file tree
Hide file tree
Showing 34 changed files with 90 additions and 86 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/create_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker_push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/helm_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- name: Checkout
uses: actions/checkout@v1
with:
submodules: true
submodules: recursive

- name: Configure Git
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/helm_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- name: Checkout
uses: actions/checkout@v1
with:
submodules: true
submodules: recursive

- name: Configure Git
run: |
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/readme_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
106 changes: 55 additions & 51 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion benchmarks/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>io.zipkin</groupId>
<artifactId>zipkin-parent</artifactId>
<version>2.24.4-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
</parent>

<artifactId>benchmarks</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion build-bin/git/version_from_trigger_tag
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

<groupId>io.zipkin</groupId>
<artifactId>zipkin-parent</artifactId>
<version>2.24.4-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
<packaging>pom</packaging>

<modules>
Expand Down
2 changes: 1 addition & 1 deletion zipkin-lens/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>io.zipkin</groupId>
<artifactId>zipkin-parent</artifactId>
<version>2.24.4-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
</parent>

<artifactId>zipkin-lens</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion zipkin-server/health-query-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<artifactId>zipkin-server-parent</artifactId>
<groupId>io.zipkin</groupId>
<version>2.24.4-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
</parent>

<artifactId>health-query-plugin</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion zipkin-server/http-query-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<artifactId>zipkin-server-parent</artifactId>
<groupId>io.zipkin</groupId>
<version>2.24.4-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
</parent>

<artifactId>http-query-plugin</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion zipkin-server/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>io.zipkin</groupId>
<artifactId>zipkin-parent</artifactId>
<version>2.24.4-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
</parent>

<artifactId>zipkin-server-parent</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion zipkin-server/receiver-otlp-trace/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<artifactId>zipkin-server-parent</artifactId>
<groupId>io.zipkin</groupId>
<version>2.24.4-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
</parent>

<artifactId>receiver-otlp-trace</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion zipkin-server/receiver-zipkin-activemq/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<artifactId>zipkin-server-parent</artifactId>
<groupId>io.zipkin</groupId>
<version>2.24.4-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
</parent>

<artifactId>receiver-zipkin-activemq</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion zipkin-server/receiver-zipkin-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<artifactId>zipkin-server-parent</artifactId>
<groupId>io.zipkin</groupId>
<version>2.24.4-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
</parent>

<artifactId>receiver-zipkin-core</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion zipkin-server/receiver-zipkin-grpc/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<artifactId>zipkin-server-parent</artifactId>
<groupId>io.zipkin</groupId>
<version>2.24.4-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
</parent>

<artifactId>receiver-zipkin-grpc</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion zipkin-server/receiver-zipkin-http/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<artifactId>zipkin-server-parent</artifactId>
<groupId>io.zipkin</groupId>
<version>2.24.4-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
</parent>

<artifactId>receiver-zipkin-http</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion zipkin-server/receiver-zipkin-kafka/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<artifactId>zipkin-server-parent</artifactId>
<groupId>io.zipkin</groupId>
<version>2.24.4-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
</parent>

<artifactId>receiver-zipkin-kafka</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion zipkin-server/receiver-zipkin-rabbitmq/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<artifactId>zipkin-server-parent</artifactId>
<groupId>io.zipkin</groupId>
<version>2.24.4-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
</parent>

<artifactId>receiver-zipkin-rabbitmq</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion zipkin-server/receiver-zipkin-scribe/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<artifactId>zipkin-server-parent</artifactId>
<groupId>io.zipkin</groupId>
<version>2.24.4-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
</parent>

<artifactId>receiver-zipkin-scribe</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion zipkin-server/server-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<artifactId>zipkin-server-parent</artifactId>
<groupId>io.zipkin</groupId>
<version>2.24.4-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
</parent>

<artifactId>zipkin-server-core</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion zipkin-server/server-starter/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<artifactId>zipkin-server-parent</artifactId>
<groupId>io.zipkin</groupId>
<version>2.24.4-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
</parent>

<artifactId>zipkin-server</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion zipkin-server/storage-cassandra/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<artifactId>zipkin-server-parent</artifactId>
<groupId>io.zipkin</groupId>
<version>2.24.4-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
</parent>

<artifactId>storage-cassandra</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion zipkin-server/telemetry-zipkin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<artifactId>zipkin-server-parent</artifactId>
<groupId>io.zipkin</groupId>
<version>2.24.4-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
</parent>

<name>Telemetry Zipkin</name>
Expand Down
2 changes: 1 addition & 1 deletion zipkin-server/zipkin-dependency/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<artifactId>zipkin-server-parent</artifactId>
<groupId>io.zipkin</groupId>
<version>2.24.4-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
</parent>

<artifactId>zipkin-dependency</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion zipkin-server/zipkin-storage-ext/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<artifactId>zipkin-server-parent</artifactId>
<groupId>io.zipkin</groupId>
<version>2.24.4-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
</parent>

<artifactId>zipkin-storage-ext</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<artifactId>zipkin-storage-ext</artifactId>
<groupId>io.zipkin</groupId>
<version>2.24.4-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
</parent>

<artifactId>zipkin-dependency-storage-banyandb</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>zipkin-storage-ext</artifactId>
<groupId>io.zipkin</groupId>
<version>2.24.4-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>zipkin-storage-ext</artifactId>
<groupId>io.zipkin</groupId>
<version>2.24.4-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
Loading

0 comments on commit fb5f56b

Please sign in to comment.