Skip to content

Commit e1ad120

Browse files
authored
Merge pull request #2 from emqx/250430-fix-versions-and-urls
chore: update links and add version management
2 parents f2bb253 + 90f5c36 commit e1ad120

File tree

7 files changed

+68
-8
lines changed

7 files changed

+68
-8
lines changed

.bumpversion.cfg

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
[bumpversion]
2+
current_version = 1.0.0
3+
commit = True
4+
commit_args = --no-verify
5+
tag = True
6+
tag_name = v{new_version}
7+
message = Version bumpup: {current_version} → {new_version}
8+
9+
[bumpversion:file:rebar.config]
10+
search = emqx_offline_message_plugin, "{current_version}"
11+
replace = emqx_offline_message_plugin, "{new_version}"
12+
13+
[bumpversion:file:src/emqx_offline_message_plugin.app.src]
14+
search = vsn, "{current_version}"
15+
replace = vsn, "{new_version}"
16+
17+
[bumpversion:file (download link):README.md]
18+
search = download/v{current_version}/
19+
replace = download/v{new_version}/
20+
21+
[bumpversion:file (plugin name-vsn):README.md]
22+
search = emqx_offline_message_plugin-{current_version}
23+
replace = emqx_offline_message_plugin-{new_version}
24+
25+
[bumpversion:file:include/emqx_omp.hrl]
26+
search = PLUGIN_RELEASE_VERSION, "{current_version}"
27+
replace = PLUGIN_RELEASE_VERSION, "{new_version}"

Makefile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,8 @@ up:
8989
down:
9090
docker compose down --volumes
9191

92-
93-
94-
92+
# bump-version-patch/minor/major
93+
.PHONY: bump-version-%
94+
bump-version-%:
95+
./scripts/bumpversion.sh $*
9596

README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,14 @@
44

55
Download the plugin:
66

7+
<!-- Do not update plugin version manually, use make bump-version-patch/minor/major instead -->
78
```bash
8-
wget https://github.com/savonarola/emqx-offline-message-plugin/releases/download/v0.0.7/emqx_offline_message_plugin-1.0.0.tar.gz
9+
wget https://github.com/emqx/emqx-offline-message-plugin/releases/download/v1.0.0/emqx_offline_message_plugin-1.0.0.tar.gz
910
```
1011

1112
Install the plugin:
1213

14+
<!-- Do not update plugin version manually, use make bump-version-patch/minor/major instead -->
1315
```bash
1416
curl -u key:secret -X POST http://localhost:18083/api/v5/plugins/install \
1517
-H "Content-Type: multipart/form-data" \

include/emqx_omp.hrl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
-define(METRICS_WORKER, emqx_omp_metrics_worker).
66
-define(PLUGIN_NAME, emqx_offline_message_plugin).
77

8+
%% Do not update version manually, use make bump-version-patch/minor/major instead
89
-define(PLUGIN_RELEASE_VERSION, "1.0.0").
910

1011
-define(PLUGIN_NAME_VSN, <<"emqx_offline_message_plugin-", ?PLUGIN_RELEASE_VERSION>>).

rebar.config

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,13 @@
3737

3838
%% this is the release version, different from app vsn in .app file
3939
{relx, [
40-
{release, {emqx_offline_message_plugin, "1.0.0"}, [
41-
emqx_offline_message_plugin
42-
]},
40+
{release,
41+
%% Do not update version manually, use make bump-version-patch/minor/major instead
42+
{emqx_offline_message_plugin, "1.0.0"},
43+
[
44+
emqx_offline_message_plugin
45+
]
46+
},
4347
{dev_mode, false},
4448
{include_erts, false},
4549
{include_src, false}

scripts/bumpversion.sh

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
#!/bin/bash
2+
3+
set -uo pipefail
4+
5+
if [ $# -ne 1 ]; then
6+
echo "Usage: $0 <patch|minor|major>"
7+
exit 1
8+
fi
9+
10+
level="$1"
11+
12+
if [ "$level" != "patch" ] && [ "$level" != "minor" ] && [ "$level" != "major" ]; then
13+
echo "Usage: $0 <patch|minor|major>"
14+
exit 1
15+
fi
16+
17+
bump2version_present=$(command -v bump2version || echo "false")
18+
if [ "$bump2version_present" = "false" ]; then
19+
echo "Please install bump2version first: pip install bump2version"
20+
exit 1
21+
fi
22+
23+
exec bump2version "$level"
24+

src/emqx_offline_message_plugin.app.src

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{application, emqx_offline_message_plugin, [
22
{description, "EMQX Offline Message Plugin"},
3-
{vsn, "0.1.0"},
3+
%% Do not update version manually, use make bump-version-patch/minor/major instead
4+
{vsn, "1.0.0"},
45
{modules, []},
56
{registered, [emqx_omp_sup]},
67
{applications, [kernel, stdlib]},

0 commit comments

Comments
 (0)