From 98a8159d9f780670791fb217b81163e7fee2abb5 Mon Sep 17 00:00:00 2001 From: revlis44 Date: Tue, 9 Dec 2025 12:05:22 +0900 Subject: [PATCH 1/3] d --- .gitea/workflows/main-build.yml | 2 +- .gitea/workflows/pr-ci.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/main-build.yml b/.gitea/workflows/main-build.yml index 8544d7a..703992b 100644 --- a/.gitea/workflows/main-build.yml +++ b/.gitea/workflows/main-build.yml @@ -2,7 +2,7 @@ name: Main-Build on: push: - branches: ["master"] + branches: ["master"] jobs: build-and-push: diff --git a/.gitea/workflows/pr-ci.yml b/.gitea/workflows/pr-ci.yml index d30eae5..b46594b 100644 --- a/.gitea/workflows/pr-ci.yml +++ b/.gitea/workflows/pr-ci.yml @@ -3,7 +3,7 @@ name: PR-CI on: pull_request: types: [opened, synchronize] # PR 생성 + 커밋 push 때만 실행 - branches: ["master"] + branches: ["master"] jobs: build-test: -- 2.49.1 From 7fb2bfdfa47c6df4a1b333f51d2f88a53722f228 Mon Sep 17 00:00:00 2001 From: revlis44 Date: Tue, 9 Dec 2025 12:06:34 +0900 Subject: [PATCH 2/3] dd --- .gitea/workflows/main-build.yml | 52 ++++++++------------------------- .gitea/workflows/pr-ci.yml | 26 +++-------------- 2 files changed, 16 insertions(+), 62 deletions(-) diff --git a/.gitea/workflows/main-build.yml b/.gitea/workflows/main-build.yml index 703992b..fa96e98 100644 --- a/.gitea/workflows/main-build.yml +++ b/.gitea/workflows/main-build.yml @@ -2,55 +2,27 @@ name: Main-Build on: push: - branches: ["master"] + branches: ["master"] jobs: build-and-push: runs-on: ubuntu-latest - container: - image: ci-maven-node:1.0 - steps: - - name: Checkout - uses: actions/checkout@v4 - - - name: Set up JDK 8 - uses: actions/setup-java@v4 - with: - distribution: temurin - java-version: "8" + - uses: actions/checkout@v4 - name: Maven Build WAR run: mvn -B clean package -DskipTests - # ------------------------------ - # 🔻 Harbor 관련 기능 임시 비활성화 - # ------------------------------ - - # - name: Docker login to Harbor - # run: | - # echo "${{ secrets.HARBOR_PASSWORD }}" | docker login harbor.sayinfo.co.kr -u ${{ secrets.HARBOR_USERNAME }} --password-stdin - - # - name: Build Docker image - # run: | - # docker build -t sayit-helpdesk:latest . - - # - 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) + - name: Login Harbor run: | - docker build -t sayit-helpdesk:local-test . + echo "${{ secrets.HARBOR_PASSWORD }}" | docker login harbor.sayinfo.co.kr -u ${{ secrets.HARBOR_USERNAME }} --password-stdin - - name: Done - run: echo "Main branch build completed (Harbor push disabled)." + - name: Build Docker image + run: | + docker build -t sayit-helpdesk:latest . + + - name: Push to Harbor + run: | + docker tag sayit-helpdesk:latest harbor.sayinfo.co.kr/helpdesk/helpdesk-service:latest + docker push harbor.sayinfo.co.kr/helpdesk/helpdesk-service:latest diff --git a/.gitea/workflows/pr-ci.yml b/.gitea/workflows/pr-ci.yml index b46594b..da2a085 100644 --- a/.gitea/workflows/pr-ci.yml +++ b/.gitea/workflows/pr-ci.yml @@ -2,33 +2,15 @@ name: PR-CI on: pull_request: - types: [opened, synchronize] # PR 생성 + 커밋 push 때만 실행 - branches: ["master"] + types: [opened, synchronize] + branches: ["master"] jobs: build-test: runs-on: ubuntu-latest - container: - image: ci-maven-node:1.0 - steps: - - name: Checkout source - uses: actions/checkout@v4 + - 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: - path: ~/.m2 - key: m2-${{ runner.os }}-${{ hashFiles('**/pom.xml') }} - restore-keys: | - m2-${{ runner.os }}- - - - name: Maven Build (compile + dependency check) + - name: Maven Build (skip tests) run: mvn -B clean package -DskipTests -- 2.49.1 From 7b47a02d9a72a8a2e69469589375345abfd4494c Mon Sep 17 00:00:00 2001 From: revlis44 Date: Tue, 9 Dec 2025 12:09:19 +0900 Subject: [PATCH 3/3] ddd --- .gitea/workflows/main-build.yml | 2 +- .gitea/workflows/pr-ci.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/main-build.yml b/.gitea/workflows/main-build.yml index fa96e98..ab3235c 100644 --- a/.gitea/workflows/main-build.yml +++ b/.gitea/workflows/main-build.yml @@ -2,7 +2,7 @@ name: Main-Build on: push: - branches: ["master"] + branches: ["master"] jobs: build-and-push: diff --git a/.gitea/workflows/pr-ci.yml b/.gitea/workflows/pr-ci.yml index da2a085..4210e1c 100644 --- a/.gitea/workflows/pr-ci.yml +++ b/.gitea/workflows/pr-ci.yml @@ -3,7 +3,7 @@ name: PR-CI on: pull_request: types: [opened, synchronize] - branches: ["master"] + branches: ["master"] jobs: build-test: -- 2.49.1