Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor(pingcap/tiflow,pingcap/tidb-tools): refactor the building of sync-diff-inspector tool #548

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

refactor(pingcap/tiflow,pingcap/tidb-tools): refactor the building of sync-diff-inspector tool #548

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c921ec8
refactor(pingcap/tiflow,pingcap/tidb-tools): refactor the building of…
wuhuizuo Feb 8, 2025
af6b36d
ci: fix ci script to solve the tidb-tools building change
wuhuizuo Feb 8, 2025
a228056
Update packages/packages.yaml.tmpl
wuhuizuo Feb 8, 2025
d2abb8a
fix(packages): fix offline packages config
wuhuizuo Feb 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions .github/scripts/ci.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,11 @@ function test_get_builder() {
local components="tidb tiflow tiflash tikv pd ctl monitoring ng-monitoring tidb-tools"
for cm in $components; do
for version in $versions; do
# Skip tidb-tools for version v9.0.0
if [[ $cm == "tidb-tools" && $version == "v9.0.0" ]]; then
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We only skip for version 9.0.0?

echo "Skipping tidb-tools for version v9.0.0"
continue
fi
for os in $operating_systems; do
for ac in $architectures; do
echo -en "[🚢] $cm $os $ac $version release:\t"
Expand Down Expand Up @@ -127,6 +132,11 @@ function test_gen_package_artifacts_script() {
local components="tidb tiflow tiflash tikv pd ctl monitoring ng-monitoring tidb-tools"
for cm in $components; do
for version in $versions; do
# Skip tidb-tools for version v9.0.0
if [[ $cm == "tidb-tools" && $version == "v9.0.0" ]]; then
echo "Skipping tidb-tools for version v9.0.0"
continue
fi
for os in $operating_systems; do
for ac in $architectures; do
echo -en "[📃📦] $cm $os $ac $version $profile:\t"
Expand Down Expand Up @@ -244,6 +254,11 @@ function test_gen_package_images_script() {
local components="tidb tiflow tiflash tikv pd ctl monitoring ng-monitoring tidb-tools"
for cm in $components; do
for version in $versions; do
# Skip tidb-tools for version v9.0.0
if [[ $cm == "tidb-tools" && $version == "v9.0.0" ]]; then
echo "Skipping tidb-tools for version v9.0.0"
continue
fi
for ac in $architectures; do
echo -en "[📃💿] $cm $os $ac $version $profile:\t"
$script "$cm" linux "$ac" "$version" "$profile" branch-xxx 123456789abcdef
Expand Down
3 changes: 3 additions & 0 deletions dockerfiles/products/tiflow/sync-diff-inspector.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
ARG BASE_IMG=ghcr.io/pingcap-qe/bases/tools-base:v1.9.2
FROM $BASE_IMG
COPY sync_diff_inspector /sync_diff_inspector
1 change: 0 additions & 1 deletion packages/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ Central declarative congfigurations for artifacts delivering.
## Prerequire tools

- [gomplate](https://github.com/hairyhenderson/gomplate)
> Please install the master version.
- [yq](https://github.com/mikefarah/yq)
- [jq](https://jqlang.github.io/jq/download/)

Expand Down
16 changes: 11 additions & 5 deletions packages/delivery.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
# yaml-language-server: $schema=../schemas/delivery-schema.json
deprecated:
- hub.pingcap.net/pingcap/tidb-binlog/image # deprecated in v8.3 and removed in v8.4.
# deprecated in v8.3 and removed in v8.4.
- hub.pingcap.net/pingcap/tidb-binlog/image
# deprecated and removed in v9.0.0, use hub.pingcap.net/pingcap/tiflow/images/sync-diff-inspector instead.
- hub.pingcap.net/pingcap/tidb-tools/image
definitions:
sync_trunk_community: &sync_trunk_community
description: delivery the trunk branch images.
Expand Down Expand Up @@ -220,6 +223,13 @@ image_copy_rules:
- <<: *sync_ga_community
dest_repositories:
- gcr.io/pingcap-public/tidbcloud/tiflow
hub.pingcap.net/pingcap/tiflow/images/sync-diff-inspector:
- <<: *sync_trunk_community
dest_repositories:
- docker.io/pingcap/sync-diff-inspector
- <<: *sync_ga_community
dest_repositories:
- docker.io/pingcap/sync-diff-inspector
hub.pingcap.net/pingcap/tiflash/image:
- <<: *sync_trunk_community
dest_repositories:
Expand Down Expand Up @@ -290,10 +300,6 @@ image_copy_rules:
- hub.pingcap.net/qa/ng-monitoring-enterprise
- gcr.io/pingcap-public/dbaas/ng-monitoring
- docker.io/pingcap/ng-monitoring-enterprise
hub.pingcap.net/pingcap/tidb-tools/image:
- <<: *sync_trunk_community
dest_repositories:
- docker.io/pingcap/tidb-tools
hub.pingcap.net/pingcap/tidb-binlog/image:
- <<: *sync_trunk_community
dest_repositories:
Expand Down
Loading
Loading