diff --git a/.github/workflows/build-docker-image.yml b/.github/workflows/build-docker-image.yml index f9fb42500..bc27c96bb 100644 --- a/.github/workflows/build-docker-image.yml +++ b/.github/workflows/build-docker-image.yml @@ -15,6 +15,8 @@ name: Publish Docker image on: + schedule: + - cron: '30 2 * * *' push: branches: - main diff --git a/.github/workflows/build-openim-web-image.yml b/.github/workflows/build-openim-web-image.yml index 4bdb07980..4e4b2c9db 100644 --- a/.github/workflows/build-openim-web-image.yml +++ b/.github/workflows/build-openim-web-image.yml @@ -15,6 +15,8 @@ name: Build OpenIM Web Docker image on: + schedule: + - cron: '30 3 * * *' push: branches: - main diff --git a/CHANGELOG/CHANGELOG-3.1.md b/CHANGELOG/CHANGELOG-3.1.md index 8d64c5ef7..894432183 100644 --- a/CHANGELOG/CHANGELOG-3.1.md +++ b/CHANGELOG/CHANGELOG-3.1.md @@ -8,24 +8,6 @@ ## [Unreleased] - -## [v3.1.3-beta.1] - 2023-08-14 - - -## [v3.1.3] - 2023-08-14 - - -## [v3.1.2-beta.3] - 2023-08-09 - - -## [v3.1.2-beta.2] - 2023-08-09 - - -## [v3.1.2-beta.1] - 2023-08-09 - - -## [v3.1.2-beta.0] - 2023-08-08 - ## v3.1.0 - 2023-07-28 ### Reverts @@ -35,10 +17,4 @@ - Merge branch 'tuoyun' -[Unreleased]: https://github.com/openimsdk/open-im-server/compare/v3.1.3-beta.1...HEAD -[v3.1.3-beta.1]: https://github.com/openimsdk/open-im-server/compare/v3.1.3...v3.1.3-beta.1 -[v3.1.3]: https://github.com/openimsdk/open-im-server/compare/v3.1.2-beta.3...v3.1.3 -[v3.1.2-beta.3]: https://github.com/openimsdk/open-im-server/compare/v3.1.2-beta.2...v3.1.2-beta.3 -[v3.1.2-beta.2]: https://github.com/openimsdk/open-im-server/compare/v3.1.2-beta.1...v3.1.2-beta.2 -[v3.1.2-beta.1]: https://github.com/openimsdk/open-im-server/compare/v3.1.2-beta.0...v3.1.2-beta.1 -[v3.1.2-beta.0]: https://github.com/openimsdk/open-im-server/compare/v3.1.0...v3.1.2-beta.0 +[Unreleased]: https://github.com/openimsdk/open-im-server/compare/v3.1.0...HEAD diff --git a/CHANGELOG/CHANGELOG-3.2.md b/CHANGELOG/CHANGELOG-3.2.md index f7823d119..3f77a8273 100644 --- a/CHANGELOG/CHANGELOG-3.2.md +++ b/CHANGELOG/CHANGELOG-3.2.md @@ -8,39 +8,15 @@ ## [Unreleased] - -## [v3.2.2] - 2023-09-03 - - -## [v3.2.3] - 2023-09-03 - - -## [v3.2.1] - 2023-09-03 - - -## [v3.2.2-beta.4] - 2023-08-28 - ## [v3.2.2-alpha.0] - 2023-08-25 - -## [v3.2.2-beta.3] - 2023-08-22 - - -## [v3.2.2-beta.2] - 2023-08-21 - - -## [v3.2.2-beta.1] - 2023-08-19 - -## [v3.2.0] - 2023-08-18 +## [v3.2.0] - 2023-08-19 ## [v3.2.0-rc.0] - 2023-08-17 - -## [v3.2.2-beta.0] - 2023-08-17 - ## v3.2.0-alpha.0 - 2023-08-16 ### Reverts @@ -50,15 +26,7 @@ - Merge branch 'tuoyun' -[Unreleased]: https://github.com/openimsdk/open-im-server/compare/v3.2.2...HEAD -[v3.2.2]: https://github.com/openimsdk/open-im-server/compare/v3.2.3...v3.2.2 -[v3.2.3]: https://github.com/openimsdk/open-im-server/compare/v3.2.1...v3.2.3 -[v3.2.1]: https://github.com/openimsdk/open-im-server/compare/v3.2.2-beta.4...v3.2.1 -[v3.2.2-beta.4]: https://github.com/openimsdk/open-im-server/compare/v3.2.2-alpha.0...v3.2.2-beta.4 -[v3.2.2-alpha.0]: https://github.com/openimsdk/open-im-server/compare/v3.2.2-beta.3...v3.2.2-alpha.0 -[v3.2.2-beta.3]: https://github.com/openimsdk/open-im-server/compare/v3.2.2-beta.2...v3.2.2-beta.3 -[v3.2.2-beta.2]: https://github.com/openimsdk/open-im-server/compare/v3.2.2-beta.1...v3.2.2-beta.2 -[v3.2.2-beta.1]: https://github.com/openimsdk/open-im-server/compare/v3.2.0...v3.2.2-beta.1 +[Unreleased]: https://github.com/openimsdk/open-im-server/compare/v3.2.2-alpha.0...HEAD +[v3.2.2-alpha.0]: https://github.com/openimsdk/open-im-server/compare/v3.2.0...v3.2.2-alpha.0 [v3.2.0]: https://github.com/openimsdk/open-im-server/compare/v3.2.0-rc.0...v3.2.0 -[v3.2.0-rc.0]: https://github.com/openimsdk/open-im-server/compare/v3.2.2-beta.0...v3.2.0-rc.0 -[v3.2.2-beta.0]: https://github.com/openimsdk/open-im-server/compare/v3.2.0-alpha.0...v3.2.2-beta.0 +[v3.2.0-rc.0]: https://github.com/openimsdk/open-im-server/compare/v3.2.0-alpha.0...v3.2.0-rc.0 diff --git a/CHANGELOG/CHANGELOG-3.3.md b/CHANGELOG/CHANGELOG-3.3.md new file mode 100644 index 000000000..f7326691a --- /dev/null +++ b/CHANGELOG/CHANGELOG-3.3.md @@ -0,0 +1,40 @@ +# Version logging for OpenIM + + + + + + +## [Unreleased] + + + +## [v3.3.1] - 2023-09-13 + + +## [v3.3.1-beta.0] - 2023-09-11 + + +## [v3.3.0-rc.1] - 2023-09-11 + + +## [v3.3.0-rc.12] - 2023-09-11 + + +## [v3.3.0] - 2023-09-09 + + +## v3.3.0-rc.0 - 2023-09-07 +### Reverts +- update etcd to v3.5.2 ([#206](https://github.com/openimsdk/open-im-server/issues/206)) + +### Pull Requests +- Merge branch 'tuoyun' + + +[Unreleased]: https://github.com/openimsdk/open-im-server/compare/v3.3.1...HEAD +[v3.3.1]: https://github.com/openimsdk/open-im-server/compare/v3.3.1-beta.0...v3.3.1 +[v3.3.1-beta.0]: https://github.com/openimsdk/open-im-server/compare/v3.3.0-rc.1...v3.3.1-beta.0 +[v3.3.0-rc.1]: https://github.com/openimsdk/open-im-server/compare/v3.3.0-rc.12...v3.3.0-rc.1 +[v3.3.0-rc.12]: https://github.com/openimsdk/open-im-server/compare/v3.3.0...v3.3.0-rc.12 +[v3.3.0]: https://github.com/openimsdk/open-im-server/compare/v3.3.0-rc.0...v3.3.0 diff --git a/deployments/README.md b/deployments/README.md index 1dfb87217..7065d45fa 100644 --- a/deployments/README.md +++ b/deployments/README.md @@ -73,7 +73,7 @@ $ SEALOS_VERSION=`curl -s https://api.github.com/repos/labring/sealos/releases/l ```bash $ export CLUSTER_USERNAME=ubuntu $ export CLUSTER_PASSWORD=123456 -$ sealos run labring/kubernetes:v1.25.0 labring/helm:v3.8.2 labring/calico:v3.24.1 \ +$ sudo sealos run labring/kubernetes:v1.25.0 labring/helm:v3.8.2 labring/calico:v3.24.1 \ --masters 10.0.0.9 \ --nodes 10.0.0.4,10.0.0.10 \ -u "$CLUSTER_USERNAME" \ diff --git a/scripts/install/openim-push.sh b/scripts/install/openim-push.sh index aa5ebe7d4..a1f889f25 100755 --- a/scripts/install/openim-push.sh +++ b/scripts/install/openim-push.sh @@ -94,7 +94,7 @@ function openim::push::install() # 1. Build openim-push make build BINS=${SERVER_NAME} - openim::common::sudo "cp ${OPENIM_OUTPUT_HOSTBIN}/${SERVER_NAME} ${OPENIM_INSTALL_DIR}/bin" + openim::common::sudo "cp -r ${OPENIM_OUTPUT_HOSTBIN}/${SERVER_NAME} ${OPENIM_INSTALL_DIR}/bin" openim::log::status "${SERVER_NAME} binary: ${OPENIM_INSTALL_DIR}/bin/${SERVER_NAME}" @@ -150,4 +150,4 @@ function openim::push::status() if [[ "$*" =~ openim::push:: ]];then eval $* -fi \ No newline at end of file +fi