diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0054b3b38e..d7c6ed9c8d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -152,7 +152,7 @@ jobs: uses: docker/build-push-action@v3 with: context: ./docker/nocobase - file: Dockerfile + 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 }} @@ -161,7 +161,7 @@ jobs: uses: docker/build-push-action@v3 with: context: ./docker/nocobase - file: Dockerfile.next + 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/release.sh b/release.sh index a15da199ec..b3b6bf45e5 100755 --- a/release.sh +++ b/release.sh @@ -3,8 +3,7 @@ IFS='.-' read -r major minor patch label pre <<< "$current_version" if [ "$label" == 'beta' ]; then if [ "$1" == '--is-feat' ]; then - new_minor=$((minor + 1)) - new_version="$major.$new_minor.0-beta" + new_version="$major.$minor.0-beta" echo $new_version; else new_patch=$((patch + 1))