From 7dd142589bd4884d6532e8fb8318e020333b66ce Mon Sep 17 00:00:00 2001 From: songhyeonpk Date: Thu, 20 Mar 2025 17:30:06 +0900 Subject: [PATCH 1/2] =?UTF-8?q?chore:=20cicd=20=ED=99=98=EA=B2=BD=EC=97=90?= =?UTF-8?q?=EC=84=9C=20=EC=8A=A4=ED=82=A4=EB=A7=88,=20=EB=8D=B0=EC=9D=B4?= =?UTF-8?q?=ED=84=B0=20init=20=EB=B0=A9=EB=B2=95=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/develop_build_deploy.yml | 15 +++++++++++++-- .github/workflows/develop_pull_request.yml | 15 +++++++++++++-- 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/.github/workflows/develop_build_deploy.yml b/.github/workflows/develop_build_deploy.yml index 7d8d7d9..33a576b 100644 --- a/.github/workflows/develop_build_deploy.yml +++ b/.github/workflows/develop_build_deploy.yml @@ -31,9 +31,20 @@ jobs: # 테스트 환경에서 필요한 스키마, 데이터 등록 - name: Apply Schema and Data + env: + TEST_POSTGRES_CONTAINER_NAME: "${{ github.event.repository.name }}-postgres-1" + TEST_POSTGRES_USER: test + TEST_POSTGRES_DB: ftm_test_db run: | - echo "${{ secrets.SCHEMA_SQL }}" > src/test/resources/test-schema.sql - echo "${{ secrets.DATA_SQL }}" > src/test/resources/test-data.sql + echo "⏳ Waiting for postgres to be ready..." + until docker exec -i $TEST_POSTGRES_CONTAINER_NAME pg_isready -U $TEST_POSTGRES_USER -d $TEST_POSTGRES_DB; do + echo "postgres is not ready yet. Retrying in 3 seconds..." + sleep 3 + done + echo "✅ postgres is ready!" + + echo "${{ secrets.SCHEMA_SQL }}" | docker exec -i $TEST_POSTGRES_CONTAINER_NAME psql -U $TEST_POSTGRES_USER -d $TEST_POSTGRES_DB + echo "${{ secrets.DATA_SQL }}" | docker exec -i $TEST_POSTGRES_CONTAINER_NAME psql -U $TEST_POSTGRES_USER -d $TEST_POSTGRES_DB # Gradlew 실행 권한 허용 - name: Grant Execute Permission for Gradlew diff --git a/.github/workflows/develop_pull_request.yml b/.github/workflows/develop_pull_request.yml index aebb5cd..08ae798 100644 --- a/.github/workflows/develop_pull_request.yml +++ b/.github/workflows/develop_pull_request.yml @@ -26,9 +26,20 @@ jobs: # 테스트 환경에서 필요한 스키마, 데이터 등록 - name: Apply Schema and Data + env: + TEST_POSTGRES_CONTAINER_NAME: "${{ github.event.repository.name }}-postgres-1" + TEST_POSTGRES_USER: test + TEST_POSTGRES_DB: ftm_test_db run: | - echo "${{ secrets.SCHEMA_SQL }}" > src/test/resources/test-schema.sql - echo "${{ secrets.DATA_SQL }}" > src/test/resources/test-data.sql + echo "⏳ Waiting for postgres to be ready..." + until docker exec -i $TEST_POSTGRES_CONTAINER_NAME pg_isready -U $TEST_POSTGRES_USER -d $TEST_POSTGRES_DB; do + echo "postgres is not ready yet. Retrying in 3 seconds..." + sleep 3 + done + echo "✅ postgres is ready!" + + echo "${{ secrets.SCHEMA_SQL }}" | docker exec -i $TEST_POSTGRES_CONTAINER_NAME psql -U $TEST_POSTGRES_USER -d $TEST_POSTGRES_DB + echo "${{ secrets.DATA_SQL }}" | docker exec -i $TEST_POSTGRES_CONTAINER_NAME psql -U $TEST_POSTGRES_USER -d $TEST_POSTGRES_DB # Gradlew 실행 권한 허용 - name: Grant Execute Permission for Gradlew From 6d2dc155df52d9d92e19d09c6aecaac08f13b644 Mon Sep 17 00:00:00 2001 From: songhyeonpk Date: Thu, 20 Mar 2025 19:51:18 +0900 Subject: [PATCH 2/2] =?UTF-8?q?chore:=20api=20=EB=AC=B8=EC=84=9C=ED=99=94?= =?UTF-8?q?=20task=20=EC=8B=A4=ED=96=89=20step=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/develop_build_deploy.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/develop_build_deploy.yml b/.github/workflows/develop_build_deploy.yml index 33a576b..00e8c1c 100644 --- a/.github/workflows/develop_build_deploy.yml +++ b/.github/workflows/develop_build_deploy.yml @@ -55,13 +55,21 @@ jobs: run: | echo "${{ secrets.ENV }}" >> .env + # Swagger API 문서화 task 실행 + - name: Apply Swagger API Document Task + run: ./gradlew copyOasToSwagger + + # Rest Docs API 문서화 task 실행 + - name: Apply Rest Docs API Document Task + run: ./gradlew copyDocument + # Gradle 빌드 - name: Build with Gradle id: gradle uses: gradle/gradle-build-action@v2 with: arguments: | - build + bootJar --scan cache-read-only: ${{ github.ref != 'refs/heads/main' && github.ref != 'refs/heads/develop' }}