From 101e7f82b428dbd50a1ba6e9fc8b3fdebb1ffd1c Mon Sep 17 00:00:00 2001 From: kyeonkim Date: Tue, 8 Oct 2024 12:53:51 +0900 Subject: [PATCH 01/10] =?UTF-8?q?fix(#77):=20CI=20=ED=8C=8C=EC=9D=B4?= =?UTF-8?q?=EB=B8=8C=EB=9D=BC=EC=9D=B8=20=EC=88=98=EC=A0=95=20-=20?= =?UTF-8?q?=EC=97=AC=EB=9F=AC=20=EA=B0=9C=EC=9D=98=20=EC=84=9C=EB=B9=84?= =?UTF-8?q?=EC=8A=A4=20=EB=B9=8C=EB=93=9C=20=EA=B3=BC=EC=A0=95=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/gradle-build.yml | 42 +++++++++++------------------- 1 file changed, 15 insertions(+), 27 deletions(-) diff --git a/.github/workflows/gradle-build.yml b/.github/workflows/gradle-build.yml index 3881fcc3..110308cf 100644 --- a/.github/workflows/gradle-build.yml +++ b/.github/workflows/gradle-build.yml @@ -9,47 +9,35 @@ permissions: jobs: build: + name: Build runs-on: ubuntu-latest permissions: write-all + strategy: + matrix: + service: [ + user/server, auth/server, gateway/server, + notification/server, order/server, payment/server, + product/product_server, slack/server ] steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 ref: ${{ github.event.pull_request.head.ref }} - name: Set up JDK 17 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: '17' distribution: 'temurin' - - name: Grant execute permission for gradlew - run: chmod +x gradlew - - name: Setup Gradle uses: gradle/actions/setup-gradle@v3 - - name: Execute Gradle build for all modules - run: | - set -e # 오류 발생 시 스크립트 종료 - - # 모든 모듈을 찾습니다. (build.gradle 파일이 있는 디렉토리) - MODULES=$(find ./service -type f \( -name "build.gradle" \) -exec dirname {} \; | sort -u) - - echo "Modules to build:" - echo "$MODULES" - - # 각 모듈에 대해 순차적으로 빌드 - for folder in $MODULES; do - echo "----------------------------" - echo "Building in $folder..." - - if [ -f "$folder/build.gradle" ]; then - echo "Building Gradle project in $folder..." - ./gradlew -p "$folder" build -x test - else - echo "Skipping $folder: build.gradle not found." - fi - done + - name: Grant execute permission for gradlew + run: chmod +x gradlew + + - name: Build with Gradle + run: ./gradlew clean build + working-directory: service/${{ matrix.service }} From b5c7762b389e9fd8589f86276fd58459ed33ef47 Mon Sep 17 00:00:00 2001 From: kyeonkim Date: Tue, 8 Oct 2024 13:00:25 +0900 Subject: [PATCH 02/10] =?UTF-8?q?fix(#77):=20gradlew=20=EA=B6=8C=ED=95=9C?= =?UTF-8?q?=20=EB=B3=80=EA=B2=BD=20=EC=8A=A4=ED=85=9D=20=EC=88=98=EC=A0=95?= =?UTF-8?q?,=20=EB=B9=8C=EB=93=9C=20=EA=B2=BD=EB=A1=9C=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/gradle-build.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/gradle-build.yml b/.github/workflows/gradle-build.yml index 110308cf..8d041e4a 100644 --- a/.github/workflows/gradle-build.yml +++ b/.github/workflows/gradle-build.yml @@ -32,12 +32,11 @@ jobs: java-version: '17' distribution: 'temurin' - - name: Setup Gradle - uses: gradle/actions/setup-gradle@v3 - - name: Grant execute permission for gradlew run: chmod +x gradlew + - name: Setup Gradle + uses: gradle/actions/setup-gradle@v3 + - name: Build with Gradle - run: ./gradlew clean build - working-directory: service/${{ matrix.service }} + run: ./gradlew clean build -p ./service/${{ matrix.path }} From be2c68af0fd3ca4af4da58ac8f13067434698b21 Mon Sep 17 00:00:00 2001 From: kyeonkim Date: Tue, 8 Oct 2024 13:02:57 +0900 Subject: [PATCH 03/10] =?UTF-8?q?fix(#77):=20=EB=B9=8C=EB=93=9C=20?= =?UTF-8?q?=EC=8B=9C=20=ED=85=8C=EC=8A=A4=ED=8A=B8=20=EC=A7=84=ED=96=89=20?= =?UTF-8?q?X?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/gradle-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gradle-build.yml b/.github/workflows/gradle-build.yml index 8d041e4a..03e85459 100644 --- a/.github/workflows/gradle-build.yml +++ b/.github/workflows/gradle-build.yml @@ -39,4 +39,4 @@ jobs: uses: gradle/actions/setup-gradle@v3 - name: Build with Gradle - run: ./gradlew clean build -p ./service/${{ matrix.path }} + run: ./gradlew clean build -p ./service/${{ matrix.path }} -x test From 8a72fc9dfb19869fcdaf65f2a2afb97b8ecf1424 Mon Sep 17 00:00:00 2001 From: kyeonkim Date: Tue, 8 Oct 2024 13:06:27 +0900 Subject: [PATCH 04/10] fix(#77): matrix.path > matrix.service --- .github/workflows/gradle-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gradle-build.yml b/.github/workflows/gradle-build.yml index 03e85459..4e018389 100644 --- a/.github/workflows/gradle-build.yml +++ b/.github/workflows/gradle-build.yml @@ -39,4 +39,4 @@ jobs: uses: gradle/actions/setup-gradle@v3 - name: Build with Gradle - run: ./gradlew clean build -p ./service/${{ matrix.path }} -x test + run: ./gradlew clean build -p ./service/${{ matrix.service }} -x test From 57e8a7c5f3c4e82c601f61f7f697ae6263139062 Mon Sep 17 00:00:00 2001 From: kyeonkim Date: Tue, 8 Oct 2024 13:10:19 +0900 Subject: [PATCH 05/10] =?UTF-8?q?fix(#77):=20=EC=97=86=EB=8A=94=20?= =?UTF-8?q?=EA=B2=BD=EB=A1=9C=EB=8A=94=20=EC=96=B4=EB=96=BB=EA=B2=8C=20?= =?UTF-8?q?=ED=95=A0=EA=B9=8C=3F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/gradle-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gradle-build.yml b/.github/workflows/gradle-build.yml index 4e018389..cc79cd5e 100644 --- a/.github/workflows/gradle-build.yml +++ b/.github/workflows/gradle-build.yml @@ -17,7 +17,7 @@ jobs: service: [ user/server, auth/server, gateway/server, notification/server, order/server, payment/server, - product/product_server, slack/server ] + product/product_server, product/server, slack/server ] steps: - name: Checkout repository From d058a131403f8d286d1cd3406aa28970d2783ee8 Mon Sep 17 00:00:00 2001 From: kyeonkim Date: Tue, 8 Oct 2024 13:16:35 +0900 Subject: [PATCH 06/10] =?UTF-8?q?fix(#77):=20=EB=B0=98=EB=B3=B5=EB=90=98?= =?UTF-8?q?=EB=8A=94=20setup=EC=9D=80=20=EB=94=B0=EB=A1=9C=20=EB=B9=BC?= =?UTF-8?q?=EC=84=9C=20=EC=A7=84=ED=96=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/gradle-build.yml | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/.github/workflows/gradle-build.yml b/.github/workflows/gradle-build.yml index cc79cd5e..489869ed 100644 --- a/.github/workflows/gradle-build.yml +++ b/.github/workflows/gradle-build.yml @@ -8,17 +8,10 @@ permissions: contents: read jobs: - build: - name: Build + setup: + name: Set up environment runs-on: ubuntu-latest permissions: write-all - strategy: - matrix: - service: [ - user/server, auth/server, gateway/server, - notification/server, order/server, payment/server, - product/product_server, product/server, slack/server ] - steps: - name: Checkout repository uses: actions/checkout@v4 @@ -38,5 +31,21 @@ jobs: - name: Setup Gradle uses: gradle/actions/setup-gradle@v3 + build: + name: Build Services + runs-on: ubuntu-latest + needs: setup # 'setup' job이 완료된 후에 실행됨 + permissions: write-all + strategy: + matrix: + service: [ + user/server, auth/server, gateway/server, + notification/server, order/server, payment/server, + product/product_server, slack/server ] + + steps: + - name: Checkout repository + uses: actions/checkout@v4 + - name: Build with Gradle run: ./gradlew clean build -p ./service/${{ matrix.service }} -x test From 8923f824455d87800f8a94ce6fc9f844e847562e Mon Sep 17 00:00:00 2001 From: kyeonkim Date: Tue, 8 Oct 2024 13:21:48 +0900 Subject: [PATCH 07/10] =?UTF-8?q?fix(#77):=20=EB=B9=8C=EB=93=9C=20?= =?UTF-8?q?=EC=8B=9C=20=EC=9E=90=EB=B0=94=20=EB=B2=84=EC=A0=84=20=EB=AA=85?= =?UTF-8?q?=EC=8B=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/gradle-build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/gradle-build.yml b/.github/workflows/gradle-build.yml index 489869ed..d46d039f 100644 --- a/.github/workflows/gradle-build.yml +++ b/.github/workflows/gradle-build.yml @@ -48,4 +48,6 @@ jobs: uses: actions/checkout@v4 - name: Build with Gradle + env: + JAVA_HOME: ${{ steps.setup.outputs.java-home }} # JAVA_HOME 설정 run: ./gradlew clean build -p ./service/${{ matrix.service }} -x test From e94360f3e59b70bfe77aecb53ba11671965d174d Mon Sep 17 00:00:00 2001 From: kyeonkim Date: Tue, 8 Oct 2024 13:24:30 +0900 Subject: [PATCH 08/10] =?UTF-8?q?fix(#77):=20=EB=82=98=EB=88=84=EB=8A=94?= =?UTF-8?q?=20=EA=B1=B4=20=EC=95=88=EB=90=A8.=20=EB=B9=8C=EB=93=9C=20?= =?UTF-8?q?=EA=B3=BC=EC=A0=95=EC=97=90=EC=84=9C=20=EA=B2=B0=EA=B5=AD?= =?UTF-8?q?=EC=97=90=20=EB=8B=A4=EC=8B=9C=20=EC=84=A4=EC=B9=98=ED=95=A8.?= =?UTF-8?q?=20=EB=8B=A4=EC=8B=9C=20=EC=9B=90=EB=9E=98=EB=8C=80=EB=A1=9C=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/gradle-build.yml | 32 +++++++++--------------------- 1 file changed, 9 insertions(+), 23 deletions(-) diff --git a/.github/workflows/gradle-build.yml b/.github/workflows/gradle-build.yml index d46d039f..bc1eb1bd 100644 --- a/.github/workflows/gradle-build.yml +++ b/.github/workflows/gradle-build.yml @@ -8,10 +8,17 @@ permissions: contents: read jobs: - setup: - name: Set up environment + build: + name: Build runs-on: ubuntu-latest permissions: write-all + strategy: + matrix: + service: [ + user/server, auth/server, gateway/server, + notification/server, order/server, payment/server, + product/product_server, slack/server ] + steps: - name: Checkout repository uses: actions/checkout@v4 @@ -28,26 +35,5 @@ jobs: - name: Grant execute permission for gradlew run: chmod +x gradlew - - name: Setup Gradle - uses: gradle/actions/setup-gradle@v3 - - build: - name: Build Services - runs-on: ubuntu-latest - needs: setup # 'setup' job이 완료된 후에 실행됨 - permissions: write-all - strategy: - matrix: - service: [ - user/server, auth/server, gateway/server, - notification/server, order/server, payment/server, - product/product_server, slack/server ] - - steps: - - name: Checkout repository - uses: actions/checkout@v4 - - name: Build with Gradle - env: - JAVA_HOME: ${{ steps.setup.outputs.java-home }} # JAVA_HOME 설정 run: ./gradlew clean build -p ./service/${{ matrix.service }} -x test From 262c6d5fb914175449d0d5f4a4342a14cf0f8dde Mon Sep 17 00:00:00 2001 From: kyeonkim Date: Tue, 8 Oct 2024 13:26:16 +0900 Subject: [PATCH 09/10] =?UTF-8?q?fix(#77):=20Setup=20Gradle=EC=9D=84=20?= =?UTF-8?q?=EC=A7=80=EC=9B=8C=EB=B4=A4=EB=8A=94=EB=8D=B0=20=EA=B2=B0?= =?UTF-8?q?=EA=B5=AD=EC=97=94=20=EB=B9=8C=EB=93=9C=20=EC=8B=9C=20=EC=84=A4?= =?UTF-8?q?=EC=B9=98=ED=95=A8.=20=EB=8B=A4=EC=8B=9C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/gradle-build.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/gradle-build.yml b/.github/workflows/gradle-build.yml index bc1eb1bd..4e018389 100644 --- a/.github/workflows/gradle-build.yml +++ b/.github/workflows/gradle-build.yml @@ -35,5 +35,8 @@ jobs: - name: Grant execute permission for gradlew run: chmod +x gradlew + - name: Setup Gradle + uses: gradle/actions/setup-gradle@v3 + - name: Build with Gradle run: ./gradlew clean build -p ./service/${{ matrix.service }} -x test From 0f5d914a77619bdbd6a4d65886829bccae624f69 Mon Sep 17 00:00:00 2001 From: kyeonkim Date: Thu, 10 Oct 2024 18:07:22 +0900 Subject: [PATCH 10/10] =?UTF-8?q?fix(#62):=20service=20=EA=B2=BD=EB=A1=9C?= =?UTF-8?q?=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/gradle-build.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/gradle-build.yml b/.github/workflows/gradle-build.yml index 4e018389..2b6f15ee 100644 --- a/.github/workflows/gradle-build.yml +++ b/.github/workflows/gradle-build.yml @@ -14,10 +14,7 @@ jobs: permissions: write-all strategy: matrix: - service: [ - user/server, auth/server, gateway/server, - notification/server, order/server, payment/server, - product/product_server, slack/server ] + service: [user, auth, gateway, notification, order, payment, product, slack, promotion] steps: - name: Checkout repository @@ -39,4 +36,4 @@ jobs: uses: gradle/actions/setup-gradle@v3 - name: Build with Gradle - run: ./gradlew clean build -p ./service/${{ matrix.service }} -x test + run: ./gradlew clean build -p ./service/${{ matrix.service }}/server -x test