diff --git a/.github/workflows/gradle.yml b/.github/workflows/backend-CI-test.yml similarity index 54% rename from .github/workflows/gradle.yml rename to .github/workflows/backend-CI-test.yml index bbebdd1f3..666314de4 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/backend-CI-test.yml @@ -13,45 +13,37 @@ permissions: jobs: build: + if: contains(github.event.pull_request.labels.*.name, 'BE') runs-on: ubuntu-22.04 permissions: pull-requests: write steps: - - uses: actions/checkout@v3 + - name: 레포지토리 체크아웃 + uses: actions/checkout@v3 + + - name: dev 전용 application.yml을 Secret에서 복사해옵니다. + run: echo "${{ secrets.APPLICATION_YML }}" | base64 --decode > ./src/main/resources/application.yml - - name: Set up JDK 17 + - name: JDK 17을 설치합니다. uses: actions/setup-java@v3 with: java-version: '17' distribution: 'corretto' - - - name: cache gradle - uses: actions/cache@v2 - with: - path: | - ~/.gradle/caches - ~/.gradle/wrapper - key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} - restore-keys: | - ${{ runner.os }}-gradle- - - - name: chmod gradlew + + - name: gradlew 권한을 부여합니다. run: chmod +x gradlew - - name: Build with Gradle + - name: Gradle을 통해 빌드합니다. run: ./gradlew build - - name: Run Coverage - run: ./gradlew test - - - name: run jacocoTestCoverage + - name: jacocoTestCoverage를 실행하고 리포트를 출력합니다. id: jacoco uses: madrapps/jacoco-report@v1.5 with: title: 📝 Jacoco Test Coverage paths: ${{ github.workspace }}/**/build/reports/jacoco/test/jacocoTestReport.xml token: ${{ secrets.GITHUB_TOKEN }} - min-coverage-overall: 85 - min-coverage-changed-files: 85 + min-coverage-overall: 80 + min-coverage-changed-files: 80 update-comment: true diff --git a/backend/src/main/resources/application.yml b/backend/src/main/resources/application.yml index a5299bfe4..da5fc9446 100644 --- a/backend/src/main/resources/application.yml +++ b/backend/src/main/resources/application.yml @@ -16,17 +16,17 @@ spring: oauth2: provider: google: - client-id: { googleClientId } - client-secret: { googleClientSecret } - redirect-uri: { googleRedirectUri } - token-uri: https://oauth2.googleapis.com/token - user-info: https://www.googleapis.com/oauth2/v2/userinfo + client-id: ${ GOOGLE_CLIENT_ID } + client-secret: ${ GOOGLE_CLIENT_SECRET } + redirect-uri: ${ GOOGLE_REDIRECT_URI } + token-uri: ${ GOOGLE_TOKEN_URI } + user-info: ${ GOOGLE_USER_INFO } kakao: - client-id: { kakaoClientId } - client-secret: { kakaoClientSecret } - redirect-uri: { kakaoRedirectUri } - token-uri: https://kauth.kakao.com/oauth/token - user-info: https://kapi.kakao.com/v2/user/me + client-id: ${ KAKAO_CLIENT_ID } + client-secret: ${ KAKAO_CLIENT_SECRET } + redirect-uri: ${ KAKAO_REDIRECT_URI } + token-uri: ${ KAKAO_TOKEN_URI } + user-info: ${ KAKAO_USER_INFO } logging: level: diff --git a/frontend/src/components/Trips/TripsHeader/TripsHeader.tsx b/frontend/src/components/trips/TripsHeader/TripsHeader.tsx similarity index 100% rename from frontend/src/components/Trips/TripsHeader/TripsHeader.tsx rename to frontend/src/components/trips/TripsHeader/TripsHeader.tsx diff --git a/frontend/src/components/Trips/TripsItem/TripsItem.style.ts b/frontend/src/components/trips/TripsItem/TripsItem.style.ts similarity index 100% rename from frontend/src/components/Trips/TripsItem/TripsItem.style.ts rename to frontend/src/components/trips/TripsItem/TripsItem.style.ts diff --git a/frontend/src/components/Trips/TripsItem/TripsItem.tsx b/frontend/src/components/trips/TripsItem/TripsItem.tsx similarity index 100% rename from frontend/src/components/Trips/TripsItem/TripsItem.tsx rename to frontend/src/components/trips/TripsItem/TripsItem.tsx diff --git a/frontend/src/components/Trips/TripsItem/TripsItemSkeleton.tsx b/frontend/src/components/trips/TripsItem/TripsItemSkeleton.tsx similarity index 100% rename from frontend/src/components/Trips/TripsItem/TripsItemSkeleton.tsx rename to frontend/src/components/trips/TripsItem/TripsItemSkeleton.tsx diff --git a/frontend/src/components/Trips/TripsItemList/TripsItemList.style.ts b/frontend/src/components/trips/TripsItemList/TripsItemList.style.ts similarity index 100% rename from frontend/src/components/Trips/TripsItemList/TripsItemList.style.ts rename to frontend/src/components/trips/TripsItemList/TripsItemList.style.ts diff --git a/frontend/src/components/Trips/TripsItemList/TripsItemList.tsx b/frontend/src/components/trips/TripsItemList/TripsItemList.tsx similarity index 100% rename from frontend/src/components/Trips/TripsItemList/TripsItemList.tsx rename to frontend/src/components/trips/TripsItemList/TripsItemList.tsx diff --git a/frontend/src/components/Trips/TripsItemList/TripsItemListSkeleton.tsx b/frontend/src/components/trips/TripsItemList/TripsItemListSkeleton.tsx similarity index 100% rename from frontend/src/components/Trips/TripsItemList/TripsItemListSkeleton.tsx rename to frontend/src/components/trips/TripsItemList/TripsItemListSkeleton.tsx diff --git a/frontend/src/components/Trips/TutorialModal/TutorialModal.style.ts b/frontend/src/components/trips/TutorialModal/TutorialModal.style.ts similarity index 100% rename from frontend/src/components/Trips/TutorialModal/TutorialModal.style.ts rename to frontend/src/components/trips/TutorialModal/TutorialModal.style.ts diff --git a/frontend/src/components/Trips/TutorialModal/TutorialModal.tsx b/frontend/src/components/trips/TutorialModal/TutorialModal.tsx similarity index 100% rename from frontend/src/components/Trips/TutorialModal/TutorialModal.tsx rename to frontend/src/components/trips/TutorialModal/TutorialModal.tsx