From 25fe739c1488ac0036954e02bc8f16035785ef66 Mon Sep 17 00:00:00 2001 From: chungjeongsu Date: Thu, 2 Apr 2026 08:41:37 +0900 Subject: [PATCH] =?UTF-8?q?[#19]=20refactor:=20PR=20CI=20=EB=B0=8F=20?= =?UTF-8?q?=EB=B8=8C=EB=9E=9C=EC=B9=98=EB=B3=84=20CD=20=EB=B0=B0=ED=8F=AC?= =?UTF-8?q?=20=ED=8C=8C=EC=9D=B4=ED=94=84=EB=9D=BC=EC=9D=B8=20=EC=A0=95?= =?UTF-8?q?=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build-push.yml | 7 ++++++- .github/workflows/cd.yml | 1 + docker-compose.yml | 4 +--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-push.yml b/.github/workflows/build-push.yml index 7e80349..c6fb287 100644 --- a/.github/workflows/build-push.yml +++ b/.github/workflows/build-push.yml @@ -1,6 +1,10 @@ name: Build and Push on: + pull_request: + branches: + - develop + - main push: branches: - develop @@ -22,7 +26,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-node@v4 with: - node-version: 24 + node-version: 20 cache: npm - run: npm ci - run: npm run test @@ -30,6 +34,7 @@ jobs: publish_image: needs: test_build + if: github.event_name != 'pull_request' runs-on: ubuntu-latest timeout-minutes: 20 permissions: diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 1f8b30e..e9cc4d6 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -29,6 +29,7 @@ jobs: ( github.event_name == 'workflow_run' && github.event.workflow_run.conclusion == 'success' && + github.event.workflow_run.event == 'push' && contains(fromJson('["develop","main"]'), github.event.workflow_run.head_branch) ) runs-on: ubuntu-latest diff --git a/docker-compose.yml b/docker-compose.yml index 61094fe..a365580 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,8 +1,6 @@ services: app: - build: - context: . - dockerfile: Dockerfile + image: ${IMAGE_NAME:-ghcr.io/team-triple/triple_yjs}:${IMAGE_TAG:-develop} ports: - "1234:1234" environment: