From 743a6a9f18cb167c8f7a3f586a3cc2d3eb178d83 Mon Sep 17 00:00:00 2001 From: "Chang, Hui-Tang" Date: Fri, 6 Sep 2024 23:04:41 +0800 Subject: [PATCH] chore: disable image build in integration test --- .github/workflows/integration-test-backend.yml | 4 ++-- .github/workflows/integration-test-console.yml | 2 +- .github/workflows/make-all.yml | 2 +- .github/workflows/make-latest.yml | 2 +- Makefile | 8 ++++++-- 5 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.github/workflows/integration-test-backend.yml b/.github/workflows/integration-test-backend.yml index dc60e0a0..3ec1a290 100644 --- a/.github/workflows/integration-test-backend.yml +++ b/.github/workflows/integration-test-backend.yml @@ -53,9 +53,9 @@ jobs: - name: Launch Instill Core (${{ inputs.target }}) run: | if [ "${{ inputs.target }}" == "latest" ]; then - make latest BUILD=true EDITION=local-ce:test + make latest BUILD_CORE_DEV_IMAGE=true EDITION=local-ce:test else - make all BUILD=true EDITION=local-ce:test + make all BUILD_CORE_DEV_IMAGE=true EDITION=local-ce:test fi - name: Uppercase component name diff --git a/.github/workflows/integration-test-console.yml b/.github/workflows/integration-test-console.yml index 6abab4b4..b08933b6 100644 --- a/.github/workflows/integration-test-console.yml +++ b/.github/workflows/integration-test-console.yml @@ -40,7 +40,7 @@ jobs: - name: Launch Instill Core (${{ inputs.target }}) run: | - make ${{ inputs.target }} BUILD=true EDITION=local-ce:test INSTILL_CORE_HOST=api-gateway + make ${{ inputs.target }} BUILD_CORE_DEV_IMAGE=true EDITION=local-ce:test INSTILL_CORE_HOST=api-gateway - name: Run console integration test (${{ inputs.target }}) run: | diff --git a/.github/workflows/make-all.yml b/.github/workflows/make-all.yml index 9aafcaa0..47db86c7 100644 --- a/.github/workflows/make-all.yml +++ b/.github/workflows/make-all.yml @@ -44,7 +44,7 @@ jobs: - name: Launch Instill Core (release) run: | - make all BUILD=true EDITION=local-ce:test + make all BUILD_CORE_DEV_IMAGE=true EDITION=local-ce:test - name: List all docker containers run: | diff --git a/.github/workflows/make-latest.yml b/.github/workflows/make-latest.yml index 7232b182..22ce37d1 100644 --- a/.github/workflows/make-latest.yml +++ b/.github/workflows/make-latest.yml @@ -48,7 +48,7 @@ jobs: - name: Launch Instill Core (latest) run: | - make latest BUILD=true EDITION=local-ce:test + make latest BUILD_CORE_DEV_IMAGE=true EDITION=local-ce:test - name: List all docker containers run: | diff --git a/Makefile b/Makefile index 4ff6d007..867f9cf1 100644 --- a/Makefile +++ b/Makefile @@ -77,7 +77,7 @@ endif .PHONY: build-latest build-latest: ## Build latest images for all services - @if [ "${BUILD}" = "true" ]; then \ + @if [ "${BUILD}" = "true" ] || [ "${BUILD_CORE_DEV_IMAGE}" = "true" ]; then \ docker build --progress plain \ --build-arg ALPINE_VERSION=${ALPINE_VERSION} \ --build-arg GOLANG_VERSION=${GOLANG_VERSION} \ @@ -86,6 +86,8 @@ build-latest: ## Build latest images for all services --build-arg CACHE_DATE="$(shell date)" \ --target latest \ -t ${INSTILL_CORE_IMAGE_NAME}:latest .; \ + fi + @if [ "${BUILD}" = "true" ]; then \ docker run --rm \ -v /var/run/docker.sock:/var/run/docker.sock \ -v ./.env:/instill-core/.env \ @@ -104,7 +106,7 @@ build-latest: ## Build latest images for all services .PHONY: build-release build-release: ## Build release images for all services - @if [ "${BUILD}" = "true" ]; then \ + @if [ "${BUILD}" = "true" ] || [ "${BUILD_CORE_DEV_IMAGE}" = "true" ]; then \ docker build --progress plain \ --build-arg ALPINE_VERSION=${ALPINE_VERSION} \ --build-arg GOLANG_VERSION=${GOLANG_VERSION} \ @@ -119,6 +121,8 @@ build-release: ## Build release images for all services --build-arg CONSOLE_VERSION=${CONSOLE_VERSION} \ --target release \ -t ${INSTILL_CORE_IMAGE_NAME}:${INSTILL_CORE_VERSION} .; \ + fi + @if [ "${BUILD}" = "true" ]; then \ docker run --rm \ -v /var/run/docker.sock:/var/run/docker.sock \ -v ./.env:/instill-core/.env \