From 92d9e81a9fc1dea124fe6ab21cbae4912a7fc370 Mon Sep 17 00:00:00 2001 From: liyang Date: Fri, 14 Feb 2025 02:14:49 +0800 Subject: [PATCH] ci: use the repository variable to pass to image-name (#5517) Co-authored-by: Yingwen --- .github/workflows/dev-build.yml | 7 ++----- .github/workflows/nightly-build.yml | 8 ++------ .github/workflows/release.yml | 4 ++-- 3 files changed, 6 insertions(+), 13 deletions(-) diff --git a/.github/workflows/dev-build.yml b/.github/workflows/dev-build.yml index 9fe001aff6..25a91291be 100644 --- a/.github/workflows/dev-build.yml +++ b/.github/workflows/dev-build.yml @@ -76,9 +76,6 @@ env: NIGHTLY_RELEASE_PREFIX: nightly - # Use the different image name to avoid conflict with the release images. - IMAGE_NAME: greptimedb-dev - # The source code will check out in the following path: '${WORKING_DIR}/dev/greptime'. CHECKOUT_GREPTIMEDB_PATH: dev/greptimedb @@ -235,7 +232,7 @@ jobs: with: image-registry: docker.io image-namespace: ${{ vars.IMAGE_NAMESPACE }} - image-name: ${{ env.IMAGE_NAME }} + image-name: ${{ vars.DEV_BUILD_IMAGE_NAME }} image-registry-username: ${{ secrets.DOCKERHUB_USERNAME }} image-registry-password: ${{ secrets.DOCKERHUB_TOKEN }} version: ${{ needs.allocate-runners.outputs.version }} @@ -267,7 +264,7 @@ jobs: with: src-image-registry: docker.io src-image-namespace: ${{ vars.IMAGE_NAMESPACE }} - src-image-name: ${{ env.IMAGE_NAME }} + src-image-name: ${{ vars.DEV_BUILD_IMAGE_NAME }} dst-image-registry-username: ${{ secrets.ALICLOUD_USERNAME }} dst-image-registry-password: ${{ secrets.ALICLOUD_PASSWORD }} dst-image-registry: ${{ vars.ACR_IMAGE_REGISTRY }} diff --git a/.github/workflows/nightly-build.yml b/.github/workflows/nightly-build.yml index 3e004272ba..4492741521 100644 --- a/.github/workflows/nightly-build.yml +++ b/.github/workflows/nightly-build.yml @@ -66,10 +66,6 @@ env: NIGHTLY_RELEASE_PREFIX: nightly - # Use the different image name to avoid conflict with the release images. - # The DockerHub image will be greptime/greptimedb-nightly. - IMAGE_NAME: greptimedb-nightly - jobs: allocate-runners: name: Allocate runners @@ -200,7 +196,7 @@ jobs: with: image-registry: docker.io image-namespace: ${{ vars.IMAGE_NAMESPACE }} - image-name: ${{ env.IMAGE_NAME }} + image-name: ${{ vars.NIGHTLY_BUILD_IMAGE_NAME }} image-registry-username: ${{ secrets.DOCKERHUB_USERNAME }} image-registry-password: ${{ secrets.DOCKERHUB_TOKEN }} version: ${{ needs.allocate-runners.outputs.version }} @@ -234,7 +230,7 @@ jobs: with: src-image-registry: docker.io src-image-namespace: ${{ vars.IMAGE_NAMESPACE }} - src-image-name: ${{ env.IMAGE_NAME }} + src-image-name: ${{ vars.NIGHTLY_BUILD_IMAGE_NAME }} dst-image-registry-username: ${{ secrets.ALICLOUD_USERNAME }} dst-image-registry-password: ${{ secrets.ALICLOUD_PASSWORD }} dst-image-registry: ${{ vars.ACR_IMAGE_REGISTRY }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index bee576a142..c18f692ea0 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -93,7 +93,6 @@ env: # Note: The NEXT_RELEASE_VERSION should be modified manually by every formal release. NEXT_RELEASE_VERSION: v0.12.0 - jobs: allocate-runners: name: Allocate runners @@ -314,6 +313,7 @@ jobs: with: image-registry: docker.io image-namespace: ${{ vars.IMAGE_NAMESPACE }} + image-name: ${{ vars.GREPTIMEDB_IMAGE_NAME }} image-registry-username: ${{ secrets.DOCKERHUB_USERNAME }} image-registry-password: ${{ secrets.DOCKERHUB_TOKEN }} version: ${{ needs.allocate-runners.outputs.version }} @@ -350,7 +350,7 @@ jobs: with: src-image-registry: docker.io src-image-namespace: ${{ vars.IMAGE_NAMESPACE }} - src-image-name: greptimedb + src-image-name: ${{ vars.GREPTIMEDB_IMAGE_NAME }} dst-image-registry-username: ${{ secrets.ALICLOUD_USERNAME }} dst-image-registry-password: ${{ secrets.ALICLOUD_PASSWORD }} dst-image-registry: ${{ vars.ACR_IMAGE_REGISTRY }}