From 0691181101f43ee4ac161961c3c0ab9eeb0ea3f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=AE=B7=E4=BA=AE=E8=BE=89?= Date: Wed, 27 Sep 2023 11:05:48 +0800 Subject: [PATCH 1/6] =?UTF-8?q?#5473=20=E8=BD=AF=E4=BB=B6=E5=8C=85?= =?UTF-8?q?=E5=88=97=E8=A1=A8=EF=BC=8C=E6=A0=B7=E5=BC=8F=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../steedos_packages_list.page.amis.json | 22 ++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/services/service-package-registry/main/default/pages/steedos_packages_list.page.amis.json b/services/service-package-registry/main/default/pages/steedos_packages_list.page.amis.json index 6b5a093f2a..240ef7080f 100644 --- a/services/service-package-registry/main/default/pages/steedos_packages_list.page.amis.json +++ b/services/service-package-registry/main/default/pages/steedos_packages_list.page.amis.json @@ -17,6 +17,14 @@ "switchPerPage": false, "bulkActions": [], "card": { + "toolbar": [ + { + "type": "steedos-badge-ribbon", + "text": "静态(不支持卸载、升级)", + "body": [], + "visibleOn": "${static}" + } + ], "header": { "avatarText": "${label|split:/|last|substring:0:2|upperCase}", "avatarTextBackground": [ @@ -33,7 +41,7 @@ "className": "bg-white", "title": "${label}@${version}", "subTitle": "$description", - "description": "$_display.status ${static && '静态(不支持卸载、升级)'}" + "description": "$_display.status" }, "actions": [ { @@ -88,6 +96,9 @@ "id": "u:2775cd701d6a", "name": "page_test__c_list", "bodyClassName": "p-0", + "cssVars": { + "--text--muted-color": "#bebfc4" + }, "css": { ".antd-Wrapper.steedos-object-table > .antd-Service": { "flex-grow": "1" @@ -109,6 +120,15 @@ }, ".antd-Service.steedos-object-table .antd-Crud .antd-Cards .antd-Cards-body": { "margin": "0.25rem" + }, + ".antd-Card-toolbar .ant-ribbon-wrapper": { + "position": "absolute", + "top": "-14px", + "right": "0" + }, + ".antd-Crud .antd-Cards .antd-Card .antd-Card-title": { + "white-space": "break-spaces", + "word-break": "break-all" } } } \ No newline at end of file From c72e01af84b11e6e9235d6e5e2f81a9aa8aaaeee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=AE=B7=E4=BA=AE=E8=BE=89?= Date: Wed, 27 Sep 2023 11:34:54 +0800 Subject: [PATCH 2/6] =?UTF-8?q?#5473=20=E8=BD=AF=E4=BB=B6=E5=8C=85?= =?UTF-8?q?=E5=88=97=E8=A1=A8=EF=BC=8C=E5=BE=AE=E9=A1=B5=E9=9D=A2=E5=9B=BD?= =?UTF-8?q?=E9=99=85=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/steedos_packages_list.page.amis.json | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/services/service-package-registry/main/default/pages/steedos_packages_list.page.amis.json b/services/service-package-registry/main/default/pages/steedos_packages_list.page.amis.json index 240ef7080f..d0eaf3f4eb 100644 --- a/services/service-package-registry/main/default/pages/steedos_packages_list.page.amis.json +++ b/services/service-package-registry/main/default/pages/steedos_packages_list.page.amis.json @@ -17,14 +17,6 @@ "switchPerPage": false, "bulkActions": [], "card": { - "toolbar": [ - { - "type": "steedos-badge-ribbon", - "text": "静态(不支持卸载、升级)", - "body": [], - "visibleOn": "${static}" - } - ], "header": { "avatarText": "${label|split:/|last|substring:0:2|upperCase}", "avatarTextBackground": [ @@ -45,7 +37,7 @@ }, "actions": [ { - "label": "启用", + "label": "${uiSchema.actions.enable.label}", "disabledOn": "${status === 'enable'}", "onEvent": { "click": { @@ -60,7 +52,7 @@ "id": "u:553d77aa3872" }, { - "label": "停用", + "label": "${uiSchema.actions.disable.label}", "disabledOn": "${status !== 'enable'}", "onEvent": { "click": { From 7cd3cb7a800a91701d881f5b945dff93f3d5864f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BA=84=E5=BB=BA=E5=9B=BD?= <9340100@qq.com> Date: Wed, 27 Sep 2023 03:50:39 +0000 Subject: [PATCH 3/6] disable docker --- .github/workflows/release-docker-enterprise.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-docker-enterprise.yml b/.github/workflows/release-docker-enterprise.yml index a9aee5c1a5..a64d6c1bc7 100644 --- a/.github/workflows/release-docker-enterprise.yml +++ b/.github/workflows/release-docker-enterprise.yml @@ -2,7 +2,7 @@ name: Release Docker EE on: workflow_run: - workflows: [Release NPM] + workflows: [Disabled-Release NPM] types: - completed From 65f13bd6c585ca7c3d0dc7fa42b3bbac59880236 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=AE=B7=E4=BA=AE=E8=BE=89?= Date: Wed, 27 Sep 2023 11:58:24 +0800 Subject: [PATCH 4/6] =?UTF-8?q?#5473=20=E8=BD=AF=E4=BB=B6=E5=8C=85?= =?UTF-8?q?=E5=88=97=E8=A1=A8=EF=BC=8C=E7=82=B9=E5=87=BB=E8=BF=9B=E5=85=A5?= =?UTF-8?q?=E8=AF=A6=E7=BB=86=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/default/pages/steedos_packages_list.page.amis.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/services/service-package-registry/main/default/pages/steedos_packages_list.page.amis.json b/services/service-package-registry/main/default/pages/steedos_packages_list.page.amis.json index d0eaf3f4eb..1583ce9bb1 100644 --- a/services/service-package-registry/main/default/pages/steedos_packages_list.page.amis.json +++ b/services/service-package-registry/main/default/pages/steedos_packages_list.page.amis.json @@ -17,6 +17,10 @@ "switchPerPage": false, "bulkActions": [], "card": { + "itemAction": { + "actionType": "link", + "link": "/app/admin/steedos_packages/view/${_id}" + }, "header": { "avatarText": "${label|split:/|last|substring:0:2|upperCase}", "avatarTextBackground": [ From d857eb869f5cfeae0d65564eff2c53d32e191689 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BA=84=E5=BB=BA=E5=9B=BD?= <9340100@qq.com> Date: Wed, 27 Sep 2023 04:00:31 +0000 Subject: [PATCH 5/6] =?UTF-8?q?=E4=BC=98=E5=8C=96=20release=20workflow?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/release-docker-enterprise.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/release-docker-enterprise.yml b/.github/workflows/release-docker-enterprise.yml index a9aee5c1a5..7c638ff126 100644 --- a/.github/workflows/release-docker-enterprise.yml +++ b/.github/workflows/release-docker-enterprise.yml @@ -5,6 +5,9 @@ on: workflows: [Release NPM] types: - completed + push: + branches: + - 'releases/**' jobs: docker: From 3a5a855edea167436f362ef042468b0614ad236e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BA=84=E5=BB=BA=E5=9B=BD?= <9340100@qq.com> Date: Wed, 27 Sep 2023 05:34:44 +0000 Subject: [PATCH 6/6] test docker workflow --- .../workflows/release-docker-enterprise.yml | 27 +++++-------------- deploy/enterprise/Dockerfile | 4 +-- lerna.json | 2 +- 3 files changed, 8 insertions(+), 25 deletions(-) diff --git a/.github/workflows/release-docker-enterprise.yml b/.github/workflows/release-docker-enterprise.yml index 7c638ff126..14f6ffad2f 100644 --- a/.github/workflows/release-docker-enterprise.yml +++ b/.github/workflows/release-docker-enterprise.yml @@ -20,25 +20,10 @@ jobs: with: fetch-depth: 0 - - name: Get branch names - id: branch-name - uses: tj-actions/branch-names@v5.2 - with: - strip_tag_prefix: v - - - name: Get the current tag - if: steps.branch-name.outputs.is_tag == 'true' # Replaces: startsWith(github.ref, 'refs/tags/') + - name: Set Current Version run: | - echo "${{ steps.branch-name.outputs.tag }}" - - - uses: nowsprinting/check-version-format-action@v3 - id: version - with: - prefix: 'v' - - - name: Check is stable - if: ${{ steps.version.outputs.is_stable != 'true' }} - run: exit 0 + CURRENT_VERSION=$(node -p 'require("./lerna.json").version') + echo "CURRENT_VERSION=${CURRENT_VERSION}" >> $GITHUB_ENV - uses: docker/setup-qemu-action@v1 - uses: docker/setup-buildx-action@v1 @@ -55,9 +40,9 @@ jobs: type=ref,event=branch type=ref,event=pr type=schedule - type=semver,pattern={{version}} - type=semver,pattern={{major}}.{{minor}} - type=semver,pattern={{major}} + type=semver,pattern={{version}},value=v${CURRENT_VERSION} + type=semver,pattern={{major}}.{{minor}},value=v${CURRENT_VERSION} + type=semver,pattern={{major}},value=v${CURRENT_VERSION} - uses: docker/login-action@v1 name: Login Docker Hub diff --git a/deploy/enterprise/Dockerfile b/deploy/enterprise/Dockerfile index 8956ea78f2..ddfdda552c 100644 --- a/deploy/enterprise/Dockerfile +++ b/deploy/enterprise/Dockerfile @@ -17,9 +17,7 @@ RUN curl -fsSL https://pgp.mongodb.com/server-4.4.asc | \ RUN echo "deb [ signed-by=/usr/share/keyrings/mongodb-server-4.4.gpg ] http://repo.mongodb.org/apt/debian buster/mongodb-org/4.4 main" | tee /etc/apt/sources.list.d/mongodb-org-4.4.list RUN apt-get update \ - && apt-get install -y mongodb-org=4.4.24 mongodb-org-server=4.4.24 mongodb-org-shell=4.4.24 mongodb-org-mongos=4.4.24 mongodb-org-tools=4.4.24 \ - && apt-get autoremove --yes \ - && apt-get clean -y + && apt-get install -y mongodb-org=4.4.24 mongodb-org-server=4.4.24 mongodb-org-shell=4.4.24 mongodb-org-mongos=4.4.24 mongodb-org-tools=4.4.24 # Install nginx && redis RUN apt-get update \ diff --git a/lerna.json b/lerna.json index 55dc683e00..f4d47612bc 100644 --- a/lerna.json +++ b/lerna.json @@ -9,5 +9,5 @@ ], "useWorkspaces": true, "npmClient": "yarn", - "version": "2.5.15-beta.4" + "version": "2.5.15-beta.5" }