From c0c1879815d5dff3ee89c986a44d9e0f9646edbf Mon Sep 17 00:00:00 2001 From: whereami0404 <whereami2048@gmail.com> Date: Wed, 1 May 2024 09:46:36 +0900 Subject: [PATCH 1/5] =?UTF-8?q?chore:=20CD=20=EC=9B=8C=ED=81=AC=20?= =?UTF-8?q?=ED=94=8C=EB=A1=9C=EC=9A=B0=20.env=20=ED=8C=8C=EC=9D=BC=20?= =?UTF-8?q?=EC=83=9D=EC=84=B1=20=ED=94=8C=EB=A1=9C=EC=9A=B0=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/CD-dev.yml | 10 +++++----- .gitignore | 6 ++++++ Api-Module/src/main/resources/application.yml | 1 + 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/.github/workflows/CD-dev.yml b/.github/workflows/CD-dev.yml index c665ab29..fce7d685 100644 --- a/.github/workflows/CD-dev.yml +++ b/.github/workflows/CD-dev.yml @@ -48,11 +48,11 @@ jobs: script: | rm -rf ./.env touch ./.env -# echo "DOCKER_USERNAME=${{ secrets.DOCKER_USERNAME }}" >> ./.env -# echo "DOCKER_REPOSITORY=${{ secrets.DOCKER_REPOSITORY }}" >> ./.env -# echo "DB_URL=${{ secrets.DEV_DB_URL }}" >> ./.env -# echo "DB_USERNAME=${{ secrets.DEV_DB_USERNAME }}" >> ./.env -# echo "DB_PASSWORD=${{ secrets.DEV_DB_PASSWORD }}" >> ./.env + echo "DOCKER_USERNAME=${{ secrets.DOCKER_USERNAME }}" >> ./.env + echo "DOCKER_REPOSITORY=${{ secrets.DOCKER_REPOSITORY }}" >> ./.env + echo "DB_URL=${{ secrets.DEV_DB_URL }}" >> ./.env + echo "DB_USERNAME=${{ secrets.DEV_DB_USERNAME }}" >> ./.env + echo "DB_PASSWORD=${{ secrets.DEV_DB_PASSWORD }}" >> ./.env # echo "JWT_SECRET=${{ secrets.JWT_SECRET }}" >> ./.env # echo "KAKAO_APP_ID=${{ secrets.KAKAO_APP_ID }}" >> ./.env # echo "APPLE_APP_ID=${{ secrets.APPLE_APP_ID }}" >> ./.env diff --git a/.gitignore b/.gitignore index 5a979af6..50527697 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,9 @@ out/ ### Kotlin ### .kotlin + +### .env ### +.env + +### .DS_Store ### +.DS_Store/ \ No newline at end of file diff --git a/Api-Module/src/main/resources/application.yml b/Api-Module/src/main/resources/application.yml index 018085c6..c8e07c17 100644 --- a/Api-Module/src/main/resources/application.yml +++ b/Api-Module/src/main/resources/application.yml @@ -14,6 +14,7 @@ spring: properties: hibernate.format_sql: true dialect: org.hibernate.dialect.MySQLDialect + open-in-view: false security: oauth2: From 4f130024e35df0d226f482aa5d0ad2793555c3e5 Mon Sep 17 00:00:00 2001 From: whereami2048 <whereami2048@gmail.com> Date: Thu, 2 May 2024 11:10:21 +0900 Subject: [PATCH 2/5] =?UTF-8?q?chore:=20=ED=85=8C=EC=8A=A4=ED=8A=B8=20?= =?UTF-8?q?=EC=9A=A9=20=EC=9B=8C=ED=81=AC=ED=94=8C=EB=A1=9C=EC=9A=B0=20?= =?UTF-8?q?=ED=8A=B8=EB=A6=AC=EA=B1=B0=20=EB=B8=8C=EB=9E=9C=EC=B9=98=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/CD-dev.yml | 2 +- .github/workflows/CI-dev.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/CD-dev.yml b/.github/workflows/CD-dev.yml index fce7d685..8735e951 100644 --- a/.github/workflows/CD-dev.yml +++ b/.github/workflows/CD-dev.yml @@ -2,7 +2,7 @@ name: CD-dev on: push: - branches: [ "main" ] + branches: [ "feat/ci-cd" ] permissions: contents: read diff --git a/.github/workflows/CI-dev.yml b/.github/workflows/CI-dev.yml index f7b06e6b..b69e36b5 100644 --- a/.github/workflows/CI-dev.yml +++ b/.github/workflows/CI-dev.yml @@ -1,9 +1,9 @@ name: CI-dev on: - pull_request: + push: branches: - - develop + - feat/ci-cd jobs: ci: From a78f69f8172a1a63de4e781584cf85f56493cb0e Mon Sep 17 00:00:00 2001 From: whereami2048 <whereami2048@gmail.com> Date: Thu, 2 May 2024 11:48:04 +0900 Subject: [PATCH 3/5] =?UTF-8?q?chore:=20workflow=20=ED=8C=8C=EC=9D=BC=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/CD-dev.yml | 2 +- .github/workflows/CI-dev.yml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/CD-dev.yml b/.github/workflows/CD-dev.yml index 8735e951..9245996d 100644 --- a/.github/workflows/CD-dev.yml +++ b/.github/workflows/CD-dev.yml @@ -9,7 +9,7 @@ permissions: jobs: deploy: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - name: checkout uses: actions/checkout@v3 diff --git a/.github/workflows/CI-dev.yml b/.github/workflows/CI-dev.yml index b69e36b5..9a901047 100644 --- a/.github/workflows/CI-dev.yml +++ b/.github/workflows/CI-dev.yml @@ -2,8 +2,7 @@ name: CI-dev on: push: - branches: - - feat/ci-cd + branches: [ "feat/ci-cd" ] jobs: ci: @@ -29,7 +28,8 @@ jobs: restore-keys: | ${{ runner.os }}-gradle- - - name: Grant Execute Permission For Gradlew + # gradle build + - name: Grant execute permission for gradlew run: chmod +x gradlew - name: Build With Gradle From cffc6590ccdee8b26cd033e296b763e75aea9426 Mon Sep 17 00:00:00 2001 From: whereami2048 <whereami2048@gmail.com> Date: Thu, 2 May 2024 11:58:20 +0900 Subject: [PATCH 4/5] =?UTF-8?q?chore:=20workflow=20=ED=8C=8C=EC=9D=BC=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/CI-dev.yml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/.github/workflows/CI-dev.yml b/.github/workflows/CI-dev.yml index 9a901047..87f2cebf 100644 --- a/.github/workflows/CI-dev.yml +++ b/.github/workflows/CI-dev.yml @@ -2,10 +2,11 @@ name: CI-dev on: push: - branches: [ "feat/ci-cd" ] + branches: + - feat/ci-cd jobs: - ci: + build: runs-on: ubuntu-22.04 steps: @@ -17,7 +18,6 @@ jobs: java-version: '17' distribution: 'corretto' - # Gradle 의존성 캐싱 - name: Gradle Caching uses: actions/cache@v3 with: @@ -27,13 +27,11 @@ jobs: key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} restore-keys: | ${{ runner.os }}-gradle- - - # gradle build - - name: Grant execute permission for gradlew + - name: Grant Execute Permission For Gradlew run: chmod +x gradlew - name: Build With Gradle run: | ./gradlew build -# ./gradlew generateRestDocs + ./gradlew generateRestDocs ./gradlew bootJar \ No newline at end of file From 711e2b19996d8a3405df357a95f15557d65a7b93 Mon Sep 17 00:00:00 2001 From: whereami2048 <whereami2048@gmail.com> Date: Thu, 2 May 2024 12:01:04 +0900 Subject: [PATCH 5/5] =?UTF-8?q?chore:=20CI=20restdocs=20=EC=83=9D=EC=84=B1?= =?UTF-8?q?=20=EA=B5=AC=EB=AC=B8=20=EC=A0=9C=EC=99=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/CI-dev.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI-dev.yml b/.github/workflows/CI-dev.yml index 87f2cebf..c3c13023 100644 --- a/.github/workflows/CI-dev.yml +++ b/.github/workflows/CI-dev.yml @@ -33,5 +33,5 @@ jobs: - name: Build With Gradle run: | ./gradlew build - ./gradlew generateRestDocs +# ./gradlew generateRestDocs ./gradlew bootJar \ No newline at end of file