diff options
| author | zhangshuai <[email protected]> | 2022-07-18 16:29:01 +0800 |
|---|---|---|
| committer | zhangshuai <[email protected]> | 2022-07-18 16:29:01 +0800 |
| commit | 84939112fb9ef41a664ab84c7a59835242a21ecf (patch) | |
| tree | 9821ebbec67d8fbdf213f345b922d7340e0c58f0 | |
| parent | 85fc012384d044c8fab4f8840324787db030b29c (diff) | |
| parent | 63c13f0204930d4945a8dbf4c166fdcfe59dea16 (diff) | |
Merge remote-tracking branch 'origin/master'
# Conflicts:
# tools/package.sh
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | tools/package.sh | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f4c9527..535f05d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,7 +3,7 @@ image: git.mesalab.cn:7443/nezha/nz-build-env:1.3 # 定义全局变量 variables: # minio 连接信息 - MINIO_HOST: 'http://192.168.44.36:2020/' + MINIO_HOST: 'http://192.168.41.160:2020/' MINIO_USER: 'admin' MINIO_PWD: "Nezha@02!" MAVEN_REPO: "/etc/maven/repository/" diff --git a/tools/package.sh b/tools/package.sh index 0be841c..4fc0e52 100644 --- a/tools/package.sh +++ b/tools/package.sh @@ -16,9 +16,9 @@ RPM_FULL_NAME=${PACKAGE_NAME}-${PACKAGE_VERSION}-${ITERATION}.x86_64.rpm mc alias set nz $MINIO_HOST $MINIO_USER $MINIO_PWD #各个依赖包版本 -NZ_WEB_PKG="release/nz-web/nz-web-rel-22.08.01-e76b7d27.tar.gz" +NZ_WEB_PKG="release/nz-web/nz-web-rel-22.05.07-cfb92c31.tar.gz" NZ_AGENT_PKG="release/nz-agent/nz-agent-22.05.03.de5e6a94-Release.x86_64.rpm" -NZ_GUI_PKG="release/nz-gui/nz-gui-e8fbc137.zip" +NZ_GUI_PKG="release/nz-gui/nz-gui-3132b306.zip" NZ_TALON_PKG="release/nz-talon/nz-talon-22.05.07.737a0a99-Release.x86_64.rpm" # 拉取依赖文件 |