diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index b421cb09087bc..fa7e63a27753e 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -397,20 +397,26 @@ jobs: run: | DOCKER_IMAGE=cubejs/cube VERSION=noop + if [ "${{ github.event_name }}" = "schedule" ]; then VERSION=nightly elif [[ $GITHUB_REF == refs/tags/* ]]; then VERSION=${GITHUB_REF#refs/tags/} fi + TAGS="${DOCKER_IMAGE}:${VERSION}" + if [[ $VERSION =~ ^v[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]]; then MINOR=${VERSION%.*} MAJOR=${MINOR%.*} TAGS="$TAGS,${DOCKER_IMAGE}:${MINOR},${DOCKER_IMAGE}:${MAJOR},${DOCKER_IMAGE}:latest" fi - echo "version=${VERSION}" >> "$GITHUB_OUTPUT" - echo "tags=${TAGS}" >> "$GITHUB_OUTPUT" - echo "created=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> "$GITHUB_OUTPUT" + + { + echo "version=${VERSION}" + echo "tags=${TAGS}" + echo "created=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" + } >> "$GITHUB_OUTPUT" - name: Login to DockerHub uses: docker/login-action@v3 with: @@ -472,12 +478,15 @@ jobs: run: | DOCKER_IMAGE=cubejs/cube VERSION=noop + if [ "${{ github.event_name }}" = "schedule" ]; then VERSION=nightly elif [[ $GITHUB_REF == refs/tags/* ]]; then VERSION=${GITHUB_REF#refs/tags/} fi + TAGS="${DOCKER_IMAGE}:${VERSION}-jdk" + if [[ $VERSION =~ ^v[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]]; then MINOR=${VERSION%.*} MAJOR=${MINOR%.*} @@ -485,9 +494,12 @@ jobs: elif [ "${{ github.event_name }}" = "push" ]; then TAGS="$TAGS,${DOCKER_IMAGE}:sha-${GITHUB_SHA::8}-jdk" fi - echo "version=${VERSION}" >> "$GITHUB_OUTPUT" - echo "tags=${TAGS}" >> "$GITHUB_OUTPUT" - echo "created=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> "$GITHUB_OUTPUT" + + { + echo "version=${VERSION}" + echo "tags=${TAGS}" + echo "created=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" + } >> "$GITHUB_OUTPUT" - name: Login to DockerHub uses: docker/login-action@v3 with: @@ -569,6 +581,7 @@ jobs: run: | DOCKER_IMAGE=cubejs/cubestore VERSION=noop + if [ "${{ github.event_name }}" = "schedule" ]; then VERSION=nightly elif [[ $GITHUB_REF == refs/tags/* ]]; then @@ -583,9 +596,11 @@ jobs: TAGS="$TAGS,${DOCKER_IMAGE}:${MINOR}${{ matrix.postfix }},${DOCKER_IMAGE}:${MAJOR}${{ matrix.postfix }},${DOCKER_IMAGE}:${{ matrix.tag }}" fi - echo "version=${VERSION}" >> "$GITHUB_OUTPUT" - echo "tags=${TAGS}" >> "$GITHUB_OUTPUT" - echo "created=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> "$GITHUB_OUTPUT" + { + echo "version=${VERSION}" + echo "tags=${TAGS}" + echo "created=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" + } >> "$GITHUB_OUTPUT" - name: Login to DockerHub uses: docker/login-action@v3 with: diff --git a/.github/workflows/rust-cubestore-master.yml b/.github/workflows/rust-cubestore-master.yml index 62833595cd459..ce5c0bb9f513a 100644 --- a/.github/workflows/rust-cubestore-master.yml +++ b/.github/workflows/rust-cubestore-master.yml @@ -139,9 +139,11 @@ jobs: TAGS="$TAGS,${DOCKER_IMAGE}:build-1${GITHUB_RUN_NUMBER}${{ matrix.postfix }}" fi - echo "version=${VERSION}" >> "$GITHUB_OUTPUT" - echo "tags=${TAGS}" >> "$GITHUB_OUTPUT" - echo "created=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> "$GITHUB_OUTPUT" + { + echo "version=${VERSION}" + echo "tags=${TAGS}" + echo "created=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" + } >> "$GITHUB_OUTPUT" - name: Login to DockerHub uses: docker/login-action@v3 with: