Skip to content

Commit d54cf42

Browse files
authored
[ISSUE #7446]🔨update dependencies to version 0.9.0 and adjust project count in publish scripts (#7447)
1 parent 3053ebb commit d54cf42

5 files changed

Lines changed: 131 additions & 57 deletions

File tree

distribution/package_publish_workspace.bat

Lines changed: 106 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ set "CURRENT_DIR=%cd%"
1818
for %%I in ("%~dp0.") do set "SCRIPT_DIR=%%~fI"
1919
for %%I in ("%SCRIPT_DIR%\..") do set "WORKSPACE_ROOT=%%~fI"
2020

21-
set "PROJECT_COUNT=16"
21+
set "PROJECT_COUNT=18"
2222
set "PROJECT_1_NAME=rocketmq-error"
2323
set "PROJECT_1_PATH=rocketmq-error"
2424
set "PROJECT_1_ALIASES=rocketmq-error"
@@ -31,63 +31,92 @@ set "PROJECT_3_ALIASES=rocketmq-runtime"
3131
set "PROJECT_4_NAME=rocketmq-dashboard-common"
3232
set "PROJECT_4_PATH=rocketmq-dashboard\rocketmq-dashboard-common"
3333
set "PROJECT_4_ALIASES=rocketmq-dashboard-common"
34-
set "PROJECT_5_NAME=rocketmq-admin-cli"
35-
set "PROJECT_5_PATH=rocketmq-tools\rocketmq-admin\rocketmq-admin-cli"
36-
set "PROJECT_5_ALIASES=rocketmq-admin-cli"
37-
set "PROJECT_6_NAME=rocketmq-rust"
38-
set "PROJECT_6_PATH=rocketmq"
39-
set "PROJECT_6_ALIASES=rocketmq,rocketmq-rust"
40-
set "PROJECT_7_NAME=rocketmq-admin-tui"
41-
set "PROJECT_7_PATH=rocketmq-tools\rocketmq-admin\rocketmq-admin-tui"
42-
set "PROJECT_7_ALIASES=rocketmq-admin-tui"
43-
set "PROJECT_8_NAME=rocketmq-common"
44-
set "PROJECT_8_PATH=rocketmq-common"
45-
set "PROJECT_8_ALIASES=rocketmq-common"
46-
set "PROJECT_9_NAME=rocketmq-filter"
47-
set "PROJECT_9_PATH=rocketmq-filter"
48-
set "PROJECT_9_ALIASES=rocketmq-filter"
49-
set "PROJECT_10_NAME=rocketmq-remoting"
50-
set "PROJECT_10_PATH=rocketmq-remoting"
51-
set "PROJECT_10_ALIASES=rocketmq-remoting"
52-
set "PROJECT_11_NAME=rocketmq-auth"
53-
set "PROJECT_11_PATH=rocketmq-auth"
54-
set "PROJECT_11_ALIASES=rocketmq-auth"
55-
set "PROJECT_12_NAME=rocketmq-client-rust"
56-
set "PROJECT_12_PATH=rocketmq-client"
57-
set "PROJECT_12_ALIASES=rocketmq-client,rocketmq-client-rust"
58-
set "PROJECT_13_NAME=rocketmq-namesrv"
59-
set "PROJECT_13_PATH=rocketmq-namesrv"
60-
set "PROJECT_13_ALIASES=rocketmq-namesrv"
61-
set "PROJECT_14_NAME=rocketmq-store"
62-
set "PROJECT_14_PATH=rocketmq-store"
63-
set "PROJECT_14_ALIASES=rocketmq-store"
34+
set "PROJECT_5_NAME=rocketmq-rust"
35+
set "PROJECT_5_PATH=rocketmq"
36+
set "PROJECT_5_ALIASES=rocketmq,rocketmq-rust"
37+
set "PROJECT_6_NAME=rocketmq-common"
38+
set "PROJECT_6_PATH=rocketmq-common"
39+
set "PROJECT_6_ALIASES=rocketmq-common"
40+
set "PROJECT_7_NAME=rocketmq-filter"
41+
set "PROJECT_7_PATH=rocketmq-filter"
42+
set "PROJECT_7_ALIASES=rocketmq-filter"
43+
set "PROJECT_8_NAME=rocketmq-remoting"
44+
set "PROJECT_8_PATH=rocketmq-remoting"
45+
set "PROJECT_8_ALIASES=rocketmq-remoting"
46+
set "PROJECT_9_NAME=rocketmq-auth"
47+
set "PROJECT_9_PATH=rocketmq-auth"
48+
set "PROJECT_9_ALIASES=rocketmq-auth"
49+
set "PROJECT_10_NAME=rocketmq-client-rust"
50+
set "PROJECT_10_PATH=rocketmq-client"
51+
set "PROJECT_10_ALIASES=rocketmq-client,rocketmq-client-rust"
52+
set "PROJECT_11_NAME=rocketmq-controller"
53+
set "PROJECT_11_PATH=rocketmq-controller"
54+
set "PROJECT_11_ALIASES=rocketmq-controller"
55+
set "PROJECT_12_NAME=rocketmq-tieredstore"
56+
set "PROJECT_12_PATH=rocketmq-tieredstore"
57+
set "PROJECT_12_ALIASES=rocketmq-tieredstore"
58+
set "PROJECT_13_NAME=rocketmq-store"
59+
set "PROJECT_13_PATH=rocketmq-store"
60+
set "PROJECT_13_ALIASES=rocketmq-store"
61+
set "PROJECT_14_NAME=rocketmq-namesrv"
62+
set "PROJECT_14_PATH=rocketmq-namesrv"
63+
set "PROJECT_14_ALIASES=rocketmq-namesrv"
6464
set "PROJECT_15_NAME=rocketmq-admin-core"
6565
set "PROJECT_15_PATH=rocketmq-tools\rocketmq-admin\rocketmq-admin-core"
6666
set "PROJECT_15_ALIASES=rocketmq-admin-core"
67-
set "PROJECT_16_NAME=rocketmq-store-inspect"
68-
set "PROJECT_16_PATH=rocketmq-tools\rocketmq-store-inspect"
69-
set "PROJECT_16_ALIASES=rocketmq-store-inspect"
67+
set "PROJECT_16_NAME=rocketmq-admin-cli"
68+
set "PROJECT_16_PATH=rocketmq-tools\rocketmq-admin\rocketmq-admin-cli"
69+
set "PROJECT_16_ALIASES=rocketmq-admin-cli"
70+
set "PROJECT_17_NAME=rocketmq-admin-tui"
71+
set "PROJECT_17_PATH=rocketmq-tools\rocketmq-admin\rocketmq-admin-tui"
72+
set "PROJECT_17_ALIASES=rocketmq-admin-tui"
73+
set "PROJECT_18_NAME=rocketmq-store-inspect"
74+
set "PROJECT_18_PATH=rocketmq-tools\rocketmq-store-inspect"
75+
set "PROJECT_18_ALIASES=rocketmq-store-inspect"
7076

7177
:parse_args
7278
if "%~1"=="" goto args_done
7379

74-
if /i "%~1"=="--dry-run" set "DRY_RUN=1"
75-
if /i "%~1"=="--skip-package" set "SKIP_PACKAGE=1"
76-
if /i "%~1"=="--allow-dirty" set "ALLOW_DIRTY=1"
77-
if /i "%~1"=="--verbose" set "VERBOSE=1"
78-
if /i "%~1"=="--all-features" set "ALL_FEATURES=1"
79-
if /i "%~1"=="--no-default-features" set "NO_DEFAULT_FEATURES=1"
80+
if /i "%~1"=="--dry-run" (
81+
set "DRY_RUN=1"
82+
shift
83+
goto parse_args
84+
)
8085

81-
if /i "%~1"=="--features" (
82-
set "FEATURES=%~2"
86+
if /i "%~1"=="--skip-package" (
87+
set "SKIP_PACKAGE=1"
8388
shift
89+
goto parse_args
8490
)
8591

86-
if /i "%~1"=="--project" (
87-
set "SPECIFIC_PROJECT=%~2"
92+
if /i "%~1"=="--allow-dirty" (
93+
set "ALLOW_DIRTY=1"
8894
shift
95+
goto parse_args
8996
)
9097

98+
if /i "%~1"=="--verbose" (
99+
set "VERBOSE=1"
100+
shift
101+
goto parse_args
102+
)
103+
104+
if /i "%~1"=="--all-features" (
105+
set "ALL_FEATURES=1"
106+
shift
107+
goto parse_args
108+
)
109+
110+
if /i "%~1"=="--no-default-features" (
111+
set "NO_DEFAULT_FEATURES=1"
112+
shift
113+
goto parse_args
114+
)
115+
116+
if /i "%~1"=="--features" goto :farg
117+
118+
if /i "%~1"=="--project" goto parse_project_arg
119+
91120
if /i "%~1"=="--help" (
92121
echo Usage: package_publish_workspace.bat [OPTIONS]
93122
echo.
@@ -114,15 +143,47 @@ if /i "%~1"=="--help" (
114143
echo rocketmq-dashboard\rocketmq-dashboard-gpui
115144
echo rocketmq-dashboard\rocketmq-dashboard-tauri\src-tauri
116145
echo Default release temporarily excludes:
117-
echo rocketmq-controller
118146
echo rocketmq-broker
119147
echo rocketmq-proxy
120148
exit /b 0
121149
)
122150

151+
if /i "%~1"=="-h" goto show_help_short
152+
153+
echo [ERROR] Unknown option: %~1
154+
echo Run package_publish_workspace.bat --help for usage.
155+
exit /b 1
156+
157+
:show_help_short
158+
call "%~f0" --help
159+
exit /b %errorlevel%
160+
161+
:farg
162+
if "%~2"=="" goto :fmissing
163+
set "NEXT_ARG=%~2"
164+
if "!NEXT_ARG:~0,2!"=="--" goto :fmissing
165+
set "FEATURES=%~2"
166+
shift
123167
shift
124168
goto parse_args
125169

170+
:fmissing
171+
echo [ERROR] --features requires a value
172+
exit /b 1
173+
174+
:parse_project_arg
175+
if "%~2"=="" goto missing_project_arg
176+
set "NEXT_ARG=%~2"
177+
if "!NEXT_ARG:~0,2!"=="--" goto missing_project_arg
178+
set "SPECIFIC_PROJECT=%~2"
179+
shift
180+
shift
181+
goto parse_args
182+
183+
:missing_project_arg
184+
echo [ERROR] --project requires a value
185+
exit /b 1
186+
126187
:args_done
127188
if not exist "%WORKSPACE_ROOT%\Cargo.toml" (
128189
echo [ERROR] Workspace root Cargo.toml not found: %WORKSPACE_ROOT%

distribution/package_publish_workspace.sh

Lines changed: 22 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -38,25 +38,26 @@ CURRENT_DIR="$(pwd)"
3838
# - rocketmq-dashboard/rocketmq-dashboard-gpui
3939
# - rocketmq-dashboard/rocketmq-dashboard-tauri/src-tauri
4040
# Temporarily excluded from default release:
41-
# - rocketmq-controller
4241
# - rocketmq-broker
4342
# - rocketmq-proxy
4443
PROJECT_SPECS=(
4544
"rocketmq-error|rocketmq-error|rocketmq-error"
4645
"rocketmq-macros|rocketmq-macros|rocketmq-macros"
4746
"rocketmq-runtime|rocketmq-runtime|rocketmq-runtime"
4847
"rocketmq-dashboard-common|rocketmq-dashboard/rocketmq-dashboard-common|rocketmq-dashboard-common"
49-
"rocketmq-admin-cli|rocketmq-tools/rocketmq-admin/rocketmq-admin-cli|rocketmq-admin-cli"
5048
"rocketmq-rust|rocketmq|rocketmq,rocketmq-rust"
51-
"rocketmq-admin-tui|rocketmq-tools/rocketmq-admin/rocketmq-admin-tui|rocketmq-admin-tui"
5249
"rocketmq-common|rocketmq-common|rocketmq-common"
5350
"rocketmq-filter|rocketmq-filter|rocketmq-filter"
5451
"rocketmq-remoting|rocketmq-remoting|rocketmq-remoting"
5552
"rocketmq-auth|rocketmq-auth|rocketmq-auth"
5653
"rocketmq-client-rust|rocketmq-client|rocketmq-client,rocketmq-client-rust"
57-
"rocketmq-namesrv|rocketmq-namesrv|rocketmq-namesrv"
54+
"rocketmq-controller|rocketmq-controller|rocketmq-controller"
55+
"rocketmq-tieredstore|rocketmq-tieredstore|rocketmq-tieredstore"
5856
"rocketmq-store|rocketmq-store|rocketmq-store"
57+
"rocketmq-namesrv|rocketmq-namesrv|rocketmq-namesrv"
5958
"rocketmq-admin-core|rocketmq-tools/rocketmq-admin/rocketmq-admin-core|rocketmq-admin-core"
59+
"rocketmq-admin-cli|rocketmq-tools/rocketmq-admin/rocketmq-admin-cli|rocketmq-admin-cli"
60+
"rocketmq-admin-tui|rocketmq-tools/rocketmq-admin/rocketmq-admin-tui|rocketmq-admin-tui"
6061
"rocketmq-store-inspect|rocketmq-tools/rocketmq-store-inspect|rocketmq-store-inspect"
6162
)
6263

@@ -162,11 +163,11 @@ EXAMPLES:
162163
163164
PUBLISH ORDER:
164165
rocketmq-error -> rocketmq-macros -> rocketmq-runtime ->
165-
rocketmq-dashboard-common -> rocketmq-admin-cli -> rocketmq-rust ->
166-
rocketmq-admin-tui -> rocketmq-common -> rocketmq-filter ->
166+
rocketmq-dashboard-common -> rocketmq-rust -> rocketmq-common -> rocketmq-filter ->
167167
rocketmq-remoting -> rocketmq-auth -> rocketmq-client-rust ->
168-
rocketmq-namesrv -> rocketmq-store -> rocketmq-admin-core ->
169-
rocketmq-store-inspect
168+
rocketmq-controller -> rocketmq-tieredstore -> rocketmq-store ->
169+
rocketmq-namesrv -> rocketmq-admin-core -> rocketmq-admin-cli ->
170+
rocketmq-admin-tui -> rocketmq-store-inspect
170171
171172
NOTES:
172173
- Requires cargo login credentials configured
@@ -177,7 +178,6 @@ NOTES:
177178
rocketmq-dashboard/rocketmq-dashboard-gpui,
178179
rocketmq-dashboard/rocketmq-dashboard-tauri/src-tauri
179180
- Default release temporarily excludes:
180-
rocketmq-controller,
181181
rocketmq-broker,
182182
rocketmq-proxy
183183
@@ -200,6 +200,10 @@ while [[ $# -gt 0 ]]; do
200200
shift
201201
;;
202202
--project)
203+
if [[ $# -lt 2 || -z "$2" || "$2" == --* ]]; then
204+
print_error "--project requires a value"
205+
exit 1
206+
fi
203207
SPECIFIC_PROJECT="$2"
204208
shift 2
205209
;;
@@ -216,6 +220,10 @@ while [[ $# -gt 0 ]]; do
216220
shift
217221
;;
218222
--features)
223+
if [[ $# -lt 2 || -z "$2" || "$2" == --* ]]; then
224+
print_error "--features requires a value"
225+
exit 1
226+
fi
219227
FEATURES="$2"
220228
shift 2
221229
;;
@@ -239,6 +247,11 @@ fi
239247

240248
cd "$WORKSPACE_ROOT"
241249

250+
if { [ "$SKIP_PACKAGE" = false ] || [ "$DRY_RUN" = false ]; } && ! command -v cargo >/dev/null 2>&1; then
251+
print_error "cargo not found in PATH"
252+
exit 1
253+
fi
254+
242255
print_header "RocketMQ Rust Workspace Publisher"
243256
print_info "Workspace Root: $WORKSPACE_ROOT"
244257
print_info "Start Time: $(date '+%Y-%m-%d %H:%M:%S')"

rocketmq-store/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ rocketmq-common = { workspace = true }
5353
rocketmq-rust = { workspace = true }
5454
rocketmq-remoting = { workspace = true }
5555
rocketmq-error = { workspace = true }
56-
rocketmq-tieredstore = { path = "../rocketmq-tieredstore", optional = true }
56+
rocketmq-tieredstore = { version = "0.9.0", path = "../rocketmq-tieredstore", optional = true }
5757
rocksdb = { workspace = true, optional = true }
5858

5959
#tools

rocketmq-tools/rocketmq-admin/rocketmq-admin-cli/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ description = "Command-line interface for managing RocketMQ-Rust and
2828
rust-version.workspace = true
2929

3030
[dependencies]
31-
rocketmq-admin-core = { path = "../rocketmq-admin-core", features = ["rocksdb-export"] }
31+
rocketmq-admin-core = { version = "0.9.0", path = "../rocketmq-admin-core", features = ["rocksdb-export"] }
3232
rocketmq-common = { workspace = true }
3333
rocketmq-error = { workspace = true }
3434
rocketmq-remoting = { workspace = true }

rocketmq-tools/rocketmq-admin/rocketmq-admin-tui/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ description = "A RocketMQ Rust terminal command management tool imple
2828
rust-version.workspace = true
2929

3030
[dependencies]
31-
rocketmq-admin-core = { path = "../rocketmq-admin-core" }
31+
rocketmq-admin-core = { version = "0.9.0", path = "../rocketmq-admin-core" }
3232
rocketmq-common = { workspace = true }
3333
rocketmq-remoting = { workspace = true }
3434
rocketmq-rust = { workspace = true }

0 commit comments

Comments
 (0)