From a1ae0d3cfa6d5a6f8492707fee217b6701d255a8 Mon Sep 17 00:00:00 2001 From: revlis44 Date: Fri, 5 Dec 2025 10:54:45 +0900 Subject: [PATCH] =?UTF-8?q?=ED=95=98=EB=B2=84=20=EC=97=85=EB=A1=9C?= =?UTF-8?q?=EB=93=9C=20=EC=9E=84=EC=8B=9C=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/main-build.yml | 40 ++++++++++++++++++++++----------- .gitea/workflows/pr-ci.yml | 13 ++++++++++- 2 files changed, 39 insertions(+), 14 deletions(-) diff --git a/.gitea/workflows/main-build.yml b/.gitea/workflows/main-build.yml index 211f973..df46e82 100644 --- a/.gitea/workflows/main-build.yml +++ b/.gitea/workflows/main-build.yml @@ -7,8 +7,7 @@ on: jobs: build-and-push: runs-on: ubuntu-latest - container: - image: maven:3.9.9-eclipse-temurin-8 + steps: - name: Checkout uses: actions/checkout@v4 @@ -22,18 +21,33 @@ jobs: - name: Maven Build WAR run: mvn -B clean package -DskipTests - - name: Docker login to Harbor - run: | - echo "${{ secrets.HARBOR_PASSWORD }}" | docker login harbor.sayinfo.co.kr -u ${{ secrets.HARBOR_USERNAME }} --password-stdin + # ------------------------------ + # ๐Ÿ”ป Harbor ๊ด€๋ จ ๊ธฐ๋Šฅ ์ž„์‹œ ๋น„ํ™œ์„ฑํ™” + # ------------------------------ - - name: Build Docker image - run: | - docker build -t sayit-helpdesk:latest . + # - name: Docker login to Harbor + # run: | + # echo "${{ secrets.HARBOR_PASSWORD }}" | docker login harbor.sayinfo.co.kr -u ${{ secrets.HARBOR_USERNAME }} --password-stdin - - name: Tag image for Harbor - run: | - docker tag sayit-helpdesk:latest harbor.sayinfo.co.kr/helpdesk/helpdesk-service:latest + # - name: Build Docker image + # run: | + # docker build -t sayit-helpdesk:latest . - - name: Push image to Harbor + # - name: Tag image for Harbor + # run: | + # docker tag sayit-helpdesk:latest harbor.sayinfo.co.kr/helpdesk/helpdesk-service:latest + + # - name: Push image to Harbor + # run: | + # docker push harbor.sayinfo.co.kr/helpdesk/helpdesk-service:latest + + # ------------------------------ + # ๋ (Harbor ๋น„ํ™œ์„ฑํ™”) + # ------------------------------ + + - name: Build Docker image (local only, no push) run: | - docker push harbor.sayinfo.co.kr/helpdesk/helpdesk-service:latest + docker build -t sayit-helpdesk:local-test . + + - name: Done + run: echo "Main branch build completed (Harbor push disabled)." diff --git a/.gitea/workflows/pr-ci.yml b/.gitea/workflows/pr-ci.yml index 8108292..3319649 100644 --- a/.gitea/workflows/pr-ci.yml +++ b/.gitea/workflows/pr-ci.yml @@ -6,11 +6,22 @@ on: jobs: build-test: - runs-on: ubuntu-latest # gitea-runner LABEL ์ด๋ฆ„ + runs-on: ubuntu-latest + + # Dockerfile๋กœ ๋งŒ๋“  Maven+Docker client ์ด๋ฏธ์ง€ ์‚ฌ์šฉ + container: + image: ci-maven-node:1.0 + steps: - name: Checkout source uses: actions/checkout@v4 + - name: Set up JDK 8 + uses: actions/setup-java@v4 + with: + distribution: temurin + java-version: "8" + - name: Cache Maven repo uses: actions/cache@v4 with: