diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d7c6ed9c8d..4c3bc6e285 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -149,19 +149,25 @@ jobs: password: ${{ secrets.ALI_DOCKER_PASSWORD }} - name: Build and push main if: ${{ steps.get-info.outputs.branch == 'main' }} - uses: docker/build-push-action@v3 + uses: Wandalen/wretry.action@master with: - context: ./docker/nocobase - file: ./docker/nocobase/Dockerfile - platforms: linux/amd64,linux/arm64 - push: true - tags: nocobase/nocobase:main,nocobase/nocobase:latest,${{ steps.meta.outputs.tags }},${{ secrets.ALI_DOCKER_PUBLIC_REGISTRY }}/nocobase/nocobase:main,${{ secrets.ALI_DOCKER_PUBLIC_REGISTRY }}/nocobase/nocobase:latest,${{ secrets.ALI_DOCKER_PUBLIC_REGISTRY }}/${{ steps.meta.outputs.tags }} + attempt_limit: 3 + action: docker/build-push-action@v3 + with: | + context: ./docker/nocobase + file: ./docker/nocobase/Dockerfile + platforms: linux/amd64,linux/arm64 + push: true + tags: nocobase/nocobase:main,nocobase/nocobase:latest,${{ steps.meta.outputs.tags }},${{ secrets.ALI_DOCKER_PUBLIC_REGISTRY }}/nocobase/nocobase:main,${{ secrets.ALI_DOCKER_PUBLIC_REGISTRY }}/nocobase/nocobase:latest,${{ secrets.ALI_DOCKER_PUBLIC_REGISTRY }}/${{ steps.meta.outputs.tags }} - name: Build and push next if: ${{ steps.get-info.outputs.branch == 'next' }} - uses: docker/build-push-action@v3 + uses: Wandalen/wretry.action@master with: - context: ./docker/nocobase - file: ./docker/nocobase/Dockerfile.next - platforms: linux/amd64,linux/arm64 - push: true - tags: nocobase/nocobase:next,${{ steps.meta.outputs.tags }},${{ secrets.ALI_DOCKER_PUBLIC_REGISTRY }}/nocobase/nocobase:next,${{ secrets.ALI_DOCKER_PUBLIC_REGISTRY }}/${{ steps.meta.outputs.tags }} + attempt_limit: 3 + action: docker/build-push-action@v3 + with: | + context: ./docker/nocobase + file: ./docker/nocobase/Dockerfile.next + platforms: linux/amd64,linux/arm64 + push: true + tags: nocobase/nocobase:next,${{ steps.meta.outputs.tags }},${{ secrets.ALI_DOCKER_PUBLIC_REGISTRY }}/nocobase/nocobase:next,${{ secrets.ALI_DOCKER_PUBLIC_REGISTRY }}/${{ steps.meta.outputs.tags }} diff --git a/packages/core/client/src/schema-settings/LinkageRules/ValueDynamicComponent.tsx b/packages/core/client/src/schema-settings/LinkageRules/ValueDynamicComponent.tsx index f7bf01bf99..4c63ba2740 100644 --- a/packages/core/client/src/schema-settings/LinkageRules/ValueDynamicComponent.tsx +++ b/packages/core/client/src/schema-settings/LinkageRules/ValueDynamicComponent.tsx @@ -155,7 +155,7 @@ export const ValueDynamicComponent = (props: ValueDynamicComponentProps) => { onChange={(value) => { setMode(value); setValue({ - mode: fieldValue?.mode, + mode: value || fieldValue?.mode, }); }} >