From 2dacb4b6c524e902f117aacc9b5722e83894279f Mon Sep 17 00:00:00 2001 From: yoonseo choi Date: Tue, 23 Jul 2024 17:06:29 +0900 Subject: [PATCH 01/21] =?UTF-8?q?refactor:=20=EB=B0=B1=EC=97=94=EB=93=9C,?= =?UTF-8?q?=20=ED=94=84=EB=A1=A0=ED=8A=B8=EC=97=94=EB=93=9C=20ci=20?= =?UTF-8?q?=ED=8C=8C=EC=9D=BC=20=EB=B6=84=EB=A6=AC=20=EB=B0=8F=20gradle=20?= =?UTF-8?q?=EC=BA=90=EC=8B=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/backend_ci.yml | 95 ++++++++++++++++++++++ .github/workflows/{ci.yml => front_ci.yml} | 82 +------------------ 2 files changed, 99 insertions(+), 78 deletions(-) create mode 100644 .github/workflows/backend_ci.yml rename .github/workflows/{ci.yml => front_ci.yml} (60%) diff --git a/.github/workflows/backend_ci.yml b/.github/workflows/backend_ci.yml new file mode 100644 index 00000000..3d5bfc8e --- /dev/null +++ b/.github/workflows/backend_ci.yml @@ -0,0 +1,95 @@ +# This workflow uses actions that are not certified by GitHub. +# They are provided by a third-party and are governed by +# separate terms of service, privacy policy, and support +# documentation. +# This workflow will build a package using Gradle and then publish it to GitHub packages when a release is created +# For more information see: https://github.com/actions/setup-java/blob/main/docs/advanced-usage.md#Publishing-using-gradle + +name: BACKEND_CI + +on: + pull_request: + types: [ opened, reopened, synchronize ] + branches: [ 'main' ] + paths: + - 'backend/**' + +jobs: + BE_CI: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v4 + with: + ref: ${{ github.event.pull_request.head.ref }} + + - uses: actions/setup-java@v4 + with: + distribution: 'corretto' + java-version: '21' + server-id: github # Value of the distributionManagement/repository/id field of the pom.xml + settings-path: ${{ github.workspace }} # location for the settings.xml file + + - name: Gradle Caching + uses: actions/cache@v3 + with: + path: | + ~/.gradle/caches + ~/.gradle/wrapper + key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} + restore-keys: | + ${{ runner.os }}-gradle- + + - name: Setup Gradle + run: chmod +x ./backend/gradlew + + - name: Test with Gradle + continue-on-error: true + id: gradle_test + run: | + cd backend + ./gradlew test + + BE_SLACK_MESSAGE: + runs-on: ubuntu-latest + needs: BE_CI + if: ${{needs.BE_CI.result != 'skipped'}} + steps: + - name: Checkout repository + uses: actions/checkout@v4 + with: + ref: ${{ github.event.pull_request.head.ref }} + + - name: Get teamMember List + id: teamMembers + uses: actions/github-script@v6 + with: + script: | + const fs = require('fs'); + const workers = JSON.parse(fs.readFileSync('.github/workflows/teamMember.json')); + const mention = context.payload.pull_request.assignees.map((user) => { + const login = user.login; + const mappedValue = workers[login]; + return mappedValue ? `<@${mappedValue}>` : `No mapping found for ${login}`; + }) + return mention.join(', '); + + - name: Slack mention + uses: slackapi/slack-github-action@v1.24.0 + with: + channel-id: ${{ secrets.ISSUE_CHANNEL }} + payload: | + { + "text": "pr 테스트 결과", + "blocks": [ + { + "type": "section", + "text": { + "type": "mrkdwn", + "text": "pr 테스트 ${{ needs.BE_CI.result }} \n • 링크: <${{ github.event.pull_request.html_url }}|${{ github.event.pull_request.title }}> \n • pr 담당자: \${{ steps.teamMembers.outputs.result }} + } + } + ] + } + env: + SLACK_BOT_TOKEN: ${{ secrets.BOT_TOKEN }} diff --git a/.github/workflows/ci.yml b/.github/workflows/front_ci.yml similarity index 60% rename from .github/workflows/ci.yml rename to .github/workflows/front_ci.yml index b618bb45..8a883411 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/front_ci.yml @@ -5,91 +5,17 @@ # This workflow will build a package using Gradle and then publish it to GitHub packages when a release is created # For more information see: https://github.com/actions/setup-java/blob/main/docs/advanced-usage.md#Publishing-using-gradle -name: CI +name: FRONT_CI on: - workflow_dispatch: pull_request: types: [ opened, reopened, synchronize ] branches: [ 'main' ] + paths: + - 'frontend/**' jobs: - BE_CI: - if: ${{ contains(github.event.pull_request.labels.*.name, '🚛 백엔드') }} - runs-on: ubuntu-latest - permissions: - contents: read - packages: write - actions: write - - steps: - - uses: actions/checkout@v4 - with: - ref: ${{ github.event.pull_request.head.ref }} - - - uses: actions/setup-java@v4 - with: - distribution: 'corretto' - java-version: '21' - server-id: github # Value of the distributionManagement/repository/id field of the pom.xml - settings-path: ${{ github.workspace }} # location for the settings.xml file - - - name: Setup Gradle - run: chmod +x ./backend/gradlew - - - name: Build with Gradle - continue-on-error: true - id: gradle_build - run: | - cd backend - ./gradlew build - - BE_SLACK_MESSAGE: - runs-on: ubuntu-latest - needs: BE_CI - if: ${{needs.BE_CI.result != 'skipped'}} - steps: - - name: Checkout repository - uses: actions/checkout@v4 - with: - ref: ${{ github.event.pull_request.head.ref }} - - - name: Get teamMember List - id: teamMembers - uses: actions/github-script@v6 - with: - script: | - const fs = require('fs'); - const workers = JSON.parse(fs.readFileSync('.github/workflows/teamMember.json')); - const mention = context.payload.pull_request.assignees.map((user) => { - const login = user.login; - const mappedValue = workers[login]; - return mappedValue ? `<@${mappedValue}>` : `No mapping found for ${login}`; - }) - return mention.join(', '); - - - name: Slack mention - uses: slackapi/slack-github-action@v1.24.0 - with: - channel-id: ${{ secrets.ISSUE_CHANNEL }} - payload: | - { - "text": "pr 테스트 결과", - "blocks": [ - { - "type": "section", - "text": { - "type": "mrkdwn", - "text": "pr 테스트 ${{ needs.BE_CI.result }} \n • 링크: <${{ github.event.pull_request.html_url }}|${{ github.event.pull_request.title }}> \n • pr 담당자: \${{ steps.teamMembers.outputs.result }} - } - } - ] - } - env: - SLACK_BOT_TOKEN: ${{ secrets.BOT_TOKEN }} - FE_CI: - if: ${{ contains(github.event.pull_request.labels.*.name, '🎨 프론트엔드') }} runs-on: ubuntu-latest permissions: contents: read @@ -159,7 +85,7 @@ jobs: FE_SLACK_MESSAGE: runs-on: ubuntu-latest - needs: [FE_CI] + needs: [ FE_CI ] if: ${{needs.FE_CI.result != 'skipped'}} steps: - name: Checkout repository From acbe007ce604d9c38bc26de3dda0b2875c386d70 Mon Sep 17 00:00:00 2001 From: yoonseo choi Date: Tue, 23 Jul 2024 17:06:29 +0900 Subject: [PATCH 02/21] =?UTF-8?q?refactor:=20=EB=B0=B1=EC=97=94=EB=93=9C,?= =?UTF-8?q?=20=ED=94=84=EB=A1=A0=ED=8A=B8=EC=97=94=EB=93=9C=20ci=20?= =?UTF-8?q?=ED=8C=8C=EC=9D=BC=20=EB=B6=84=EB=A6=AC=20=EB=B0=8F=20gradle=20?= =?UTF-8?q?=EC=BA=90=EC=8B=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/front_ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/front_ci.yml b/.github/workflows/front_ci.yml index 8a883411..807ae8b2 100644 --- a/.github/workflows/front_ci.yml +++ b/.github/workflows/front_ci.yml @@ -85,7 +85,7 @@ jobs: FE_SLACK_MESSAGE: runs-on: ubuntu-latest - needs: [ FE_CI ] + needs: FE_CI if: ${{needs.FE_CI.result != 'skipped'}} steps: - name: Checkout repository From 36f63a8ff2ae74c71e053b3c27ecfd8cdf5afddd Mon Sep 17 00:00:00 2001 From: yoonseo choi Date: Wed, 24 Jul 2024 10:49:29 +0900 Subject: [PATCH 03/21] =?UTF-8?q?refactor:=20=EC=84=B1=EB=8A=A5=20?= =?UTF-8?q?=EC=B8=A1=EC=A0=95=EC=9D=84=20=EC=9C=84=ED=95=9C=20gradle=20?= =?UTF-8?q?=EC=BA=90=EC=8B=B1=20=EC=A3=BC=EC=84=9D=20=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/backend_ci.yml | 18 +++++++++--------- backend/src/main/java/develup/api/AuthApi.java | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/backend_ci.yml b/.github/workflows/backend_ci.yml index 3d5bfc8e..401fa818 100644 --- a/.github/workflows/backend_ci.yml +++ b/.github/workflows/backend_ci.yml @@ -30,15 +30,15 @@ jobs: server-id: github # Value of the distributionManagement/repository/id field of the pom.xml settings-path: ${{ github.workspace }} # location for the settings.xml file - - name: Gradle Caching - uses: actions/cache@v3 - with: - path: | - ~/.gradle/caches - ~/.gradle/wrapper - key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} - restore-keys: | - ${{ runner.os }}-gradle- +# - name: Gradle Caching +# uses: actions/cache@v3 +# with: +# path: | +# ~/.gradle/caches +# ~/.gradle/wrapper +# key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} +# restore-keys: | +# ${{ runner.os }}-gradle- - name: Setup Gradle run: chmod +x ./backend/gradlew diff --git a/backend/src/main/java/develup/api/AuthApi.java b/backend/src/main/java/develup/api/AuthApi.java index f65c30f7..35dafc64 100644 --- a/backend/src/main/java/develup/api/AuthApi.java +++ b/backend/src/main/java/develup/api/AuthApi.java @@ -14,7 +14,7 @@ @RestController public class AuthApi { - +//테스트 private final GithubOAuthService githubOAuthService; private final MemberService memberService; private final AuthService authService; From 277e726cc39cc573f97bf7cf5d3f8400cdb55a8a Mon Sep 17 00:00:00 2001 From: yoonseo choi Date: Wed, 24 Jul 2024 11:06:46 +0900 Subject: [PATCH 04/21] =?UTF-8?q?refactor:=20=EC=84=B1=EB=8A=A5=20?= =?UTF-8?q?=EC=B8=A1=EC=A0=95=EC=9D=84=20=EC=9C=84=ED=95=9C=20gradle=20?= =?UTF-8?q?=EC=BA=90=EC=8B=B1=20=EC=A3=BC=EC=84=9D=20=ED=95=B4=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/backend_ci.yml | 18 +++++++++--------- backend/src/main/java/develup/api/AuthApi.java | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/backend_ci.yml b/.github/workflows/backend_ci.yml index 401fa818..3d5bfc8e 100644 --- a/.github/workflows/backend_ci.yml +++ b/.github/workflows/backend_ci.yml @@ -30,15 +30,15 @@ jobs: server-id: github # Value of the distributionManagement/repository/id field of the pom.xml settings-path: ${{ github.workspace }} # location for the settings.xml file -# - name: Gradle Caching -# uses: actions/cache@v3 -# with: -# path: | -# ~/.gradle/caches -# ~/.gradle/wrapper -# key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} -# restore-keys: | -# ${{ runner.os }}-gradle- + - name: Gradle Caching + uses: actions/cache@v3 + with: + path: | + ~/.gradle/caches + ~/.gradle/wrapper + key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} + restore-keys: | + ${{ runner.os }}-gradle- - name: Setup Gradle run: chmod +x ./backend/gradlew diff --git a/backend/src/main/java/develup/api/AuthApi.java b/backend/src/main/java/develup/api/AuthApi.java index 35dafc64..f65c30f7 100644 --- a/backend/src/main/java/develup/api/AuthApi.java +++ b/backend/src/main/java/develup/api/AuthApi.java @@ -14,7 +14,7 @@ @RestController public class AuthApi { -//테스트 + private final GithubOAuthService githubOAuthService; private final MemberService memberService; private final AuthService authService; From 9cf6ef61a2f5c3c439ecf542f499b0840af94dd0 Mon Sep 17 00:00:00 2001 From: yoonseo choi Date: Wed, 24 Jul 2024 11:09:04 +0900 Subject: [PATCH 05/21] =?UTF-8?q?refactor:=20=EC=84=B1=EB=8A=A5=20?= =?UTF-8?q?=EC=B8=A1=EC=A0=95=EC=9D=84=20=EC=9C=84=ED=95=9C=20=EB=B0=B1?= =?UTF-8?q?=EC=97=94=EB=93=9C=20=ED=8C=A8=ED=82=A4=EC=A7=80=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 --- backend/src/main/java/develup/api/AuthApi.java | 1 + 1 file changed, 1 insertion(+) diff --git a/backend/src/main/java/develup/api/AuthApi.java b/backend/src/main/java/develup/api/AuthApi.java index f65c30f7..d2af9434 100644 --- a/backend/src/main/java/develup/api/AuthApi.java +++ b/backend/src/main/java/develup/api/AuthApi.java @@ -15,6 +15,7 @@ @RestController public class AuthApi { + // private final GithubOAuthService githubOAuthService; private final MemberService memberService; private final AuthService authService; From f916ce9ed34872f6cf1203a9b20c1a8d5d7167c1 Mon Sep 17 00:00:00 2001 From: yoonseo choi Date: Wed, 24 Jul 2024 11:18:30 +0900 Subject: [PATCH 06/21] =?UTF-8?q?refactor:=20ci=20path=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/backend_ci.yml | 2 +- .github/workflows/front_ci.yml | 2 +- backend/src/main/java/develup/api/AuthApi.java | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/backend_ci.yml b/.github/workflows/backend_ci.yml index 3d5bfc8e..f342ce09 100644 --- a/.github/workflows/backend_ci.yml +++ b/.github/workflows/backend_ci.yml @@ -12,7 +12,7 @@ on: types: [ opened, reopened, synchronize ] branches: [ 'main' ] paths: - - 'backend/**' + - backend/** jobs: BE_CI: diff --git a/.github/workflows/front_ci.yml b/.github/workflows/front_ci.yml index 807ae8b2..3f3619e5 100644 --- a/.github/workflows/front_ci.yml +++ b/.github/workflows/front_ci.yml @@ -12,7 +12,7 @@ on: types: [ opened, reopened, synchronize ] branches: [ 'main' ] paths: - - 'frontend/**' + - frontend/** jobs: FE_CI: diff --git a/backend/src/main/java/develup/api/AuthApi.java b/backend/src/main/java/develup/api/AuthApi.java index d2af9434..f65c30f7 100644 --- a/backend/src/main/java/develup/api/AuthApi.java +++ b/backend/src/main/java/develup/api/AuthApi.java @@ -15,7 +15,6 @@ @RestController public class AuthApi { - // private final GithubOAuthService githubOAuthService; private final MemberService memberService; private final AuthService authService; From a38b1f3cc95980d508c05b6cf757b138e2b9ae62 Mon Sep 17 00:00:00 2001 From: yoonseo choi Date: Wed, 24 Jul 2024 11:19:44 +0900 Subject: [PATCH 07/21] =?UTF-8?q?refactor:=20=EC=84=B1=EB=8A=A5=20?= =?UTF-8?q?=EC=B8=A1=EC=A0=95=EC=9D=84=20=EC=9C=84=ED=95=9C=20=EB=B0=B1?= =?UTF-8?q?=EC=97=94=EB=93=9C=20=ED=8C=A8=ED=82=A4=EC=A7=80=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 --- backend/src/main/java/develup/api/AuthApi.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/main/java/develup/api/AuthApi.java b/backend/src/main/java/develup/api/AuthApi.java index f65c30f7..35dafc64 100644 --- a/backend/src/main/java/develup/api/AuthApi.java +++ b/backend/src/main/java/develup/api/AuthApi.java @@ -14,7 +14,7 @@ @RestController public class AuthApi { - +//테스트 private final GithubOAuthService githubOAuthService; private final MemberService memberService; private final AuthService authService; From 9442fdb832cf430c61d9da12b2ab9750237388c8 Mon Sep 17 00:00:00 2001 From: yoonseo choi Date: Wed, 24 Jul 2024 11:23:13 +0900 Subject: [PATCH 08/21] =?UTF-8?q?refactor:=20=ED=85=8C=EC=8A=A4=ED=8A=B8?= =?UTF-8?q?=EB=A5=BC=20=EC=9C=84=ED=95=9C=20=EC=A3=BC=EC=84=9D=20=EC=9B=90?= =?UTF-8?q?=EB=B3=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/src/main/java/develup/api/AuthApi.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/main/java/develup/api/AuthApi.java b/backend/src/main/java/develup/api/AuthApi.java index 35dafc64..f65c30f7 100644 --- a/backend/src/main/java/develup/api/AuthApi.java +++ b/backend/src/main/java/develup/api/AuthApi.java @@ -14,7 +14,7 @@ @RestController public class AuthApi { -//테스트 + private final GithubOAuthService githubOAuthService; private final MemberService memberService; private final AuthService authService; From bd4e2fdaef477747b52092242cc43ab8c5b57a73 Mon Sep 17 00:00:00 2001 From: yoonseo choi Date: Wed, 24 Jul 2024 14:42:12 +0900 Subject: [PATCH 09/21] =?UTF-8?q?refactor:=20gradle=20run=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD=20=EB=B0=8F=20=EB=B6=88=ED=95=84=EC=9A=94=ED=95=9C=20?= =?UTF-8?q?=EB=B6=80=EB=B6=84=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/backend_ci.yml | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/.github/workflows/backend_ci.yml b/.github/workflows/backend_ci.yml index f342ce09..16dc6922 100644 --- a/.github/workflows/backend_ci.yml +++ b/.github/workflows/backend_ci.yml @@ -23,25 +23,14 @@ jobs: with: ref: ${{ github.event.pull_request.head.ref }} - - uses: actions/setup-java@v4 + - name: Setup Java + uses: actions/setup-java@v4 with: distribution: 'corretto' java-version: '21' - server-id: github # Value of the distributionManagement/repository/id field of the pom.xml - settings-path: ${{ github.workspace }} # location for the settings.xml file - - - name: Gradle Caching - uses: actions/cache@v3 - with: - path: | - ~/.gradle/caches - ~/.gradle/wrapper - key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} - restore-keys: | - ${{ runner.os }}-gradle- - name: Setup Gradle - run: chmod +x ./backend/gradlew + run: gradle/actions/setup-gradle@v3 - name: Test with Gradle continue-on-error: true From deae1b4e22415641a10eb7a7f8d362ff2246b00b Mon Sep 17 00:00:00 2001 From: yoonseo choi Date: Wed, 24 Jul 2024 15:34:17 +0900 Subject: [PATCH 10/21] =?UTF-8?q?refactor:=20teamMember=20env=20=EC=84=A4?= =?UTF-8?q?=EC=A0=95=20=ED=85=8C=EC=8A=A4=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/backend_ci.yml | 36 +++++++++++++++++++------------- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/.github/workflows/backend_ci.yml b/.github/workflows/backend_ci.yml index 16dc6922..989b5ba1 100644 --- a/.github/workflows/backend_ci.yml +++ b/.github/workflows/backend_ci.yml @@ -14,6 +14,9 @@ on: paths: - backend/** +env: + lilychoibb: "U07AQJWU8S3" + jobs: BE_CI: runs-on: ubuntu-latest @@ -49,19 +52,24 @@ jobs: with: ref: ${{ github.event.pull_request.head.ref }} - - name: Get teamMember List - id: teamMembers - uses: actions/github-script@v6 - with: - script: | - const fs = require('fs'); - const workers = JSON.parse(fs.readFileSync('.github/workflows/teamMember.json')); - const mention = context.payload.pull_request.assignees.map((user) => { - const login = user.login; - const mappedValue = workers[login]; - return mappedValue ? `<@${mappedValue}>` : `No mapping found for ${login}`; - }) - return mention.join(', '); + - name: Get teamMember + id: teamMember + run: | + echo "ASSIGNEE_SLACK_ID=${{ env[github.event.pull_request.assignees] }}" >> $GITHUB_ENV + +# - name: Get teamMember List +# id: teamMembers +# uses: actions/github-script@v6 +# with: +# script: | +# const fs = require('fs'); +# const workers = JSON.parse(fs.readFileSync('.github/workflows/teamMember.json')); +# const mention = context.payload.pull_request.assignees.map((user) => { +# const login = user.login; +# const mappedValue = workers[login]; +# return mappedValue ? `<@${mappedValue}>` : `No mapping found for ${login}`; +# }) +# return mention.join(', '); - name: Slack mention uses: slackapi/slack-github-action@v1.24.0 @@ -75,7 +83,7 @@ jobs: "type": "section", "text": { "type": "mrkdwn", - "text": "pr 테스트 ${{ needs.BE_CI.result }} \n • 링크: <${{ github.event.pull_request.html_url }}|${{ github.event.pull_request.title }}> \n • pr 담당자: \${{ steps.teamMembers.outputs.result }} + "text": "pr 테스트 ${{ needs.BE_CI.result }} \n • 링크: <${{ github.event.pull_request.html_url }}|${{ github.event.pull_request.title }}> \n • pr 담당자: <@${{ env.ASSIGNEE_SLACK_ID }}>" } } ] From 9bb93da1b03a5b18a7ef6f5351a80bbbaa667f3e Mon Sep 17 00:00:00 2001 From: yoonseo choi Date: Wed, 24 Jul 2024 15:37:39 +0900 Subject: [PATCH 11/21] =?UTF-8?q?refactor:=20ci=20=ED=8A=B8=EB=A6=AC?= =?UTF-8?q?=EA=B1=B0=EB=A5=BC=20=EC=9C=84=ED=95=9C=20=EC=A3=BC=EC=84=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/src/main/java/develup/api/AuthApi.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/main/java/develup/api/AuthApi.java b/backend/src/main/java/develup/api/AuthApi.java index f65c30f7..d9a940f0 100644 --- a/backend/src/main/java/develup/api/AuthApi.java +++ b/backend/src/main/java/develup/api/AuthApi.java @@ -14,7 +14,7 @@ @RestController public class AuthApi { - +// 테스트 private final GithubOAuthService githubOAuthService; private final MemberService memberService; private final AuthService authService; From 96d5f4be2f76e3907f520873e40deab91e7fd59c Mon Sep 17 00:00:00 2001 From: yoonseo choi Date: Wed, 24 Jul 2024 15:41:24 +0900 Subject: [PATCH 12/21] =?UTF-8?q?fix:=20gradle=20uses=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/backend_ci.yml | 2 +- backend/src/main/java/develup/api/AuthApi.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/backend_ci.yml b/.github/workflows/backend_ci.yml index 989b5ba1..b5fe99e8 100644 --- a/.github/workflows/backend_ci.yml +++ b/.github/workflows/backend_ci.yml @@ -33,7 +33,7 @@ jobs: java-version: '21' - name: Setup Gradle - run: gradle/actions/setup-gradle@v3 + uses: gradle/actions/setup-gradle@v3 - name: Test with Gradle continue-on-error: true diff --git a/backend/src/main/java/develup/api/AuthApi.java b/backend/src/main/java/develup/api/AuthApi.java index d9a940f0..d2af9434 100644 --- a/backend/src/main/java/develup/api/AuthApi.java +++ b/backend/src/main/java/develup/api/AuthApi.java @@ -14,7 +14,8 @@ @RestController public class AuthApi { -// 테스트 + + // private final GithubOAuthService githubOAuthService; private final MemberService memberService; private final AuthService authService; From f194e7bf77c9fc65866d847cf75e4492c9f6a9b9 Mon Sep 17 00:00:00 2001 From: yoonseo choi Date: Wed, 24 Jul 2024 15:53:39 +0900 Subject: [PATCH 13/21] =?UTF-8?q?fix:=20pull=20request=20assignee=20?= =?UTF-8?q?=EA=B0=80=EC=A0=B8=EC=98=A4=EB=8A=94=20=EB=B6=80=EB=B6=84=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/backend_ci.yml | 2 +- backend/src/main/java/develup/api/AuthApi.java | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/backend_ci.yml b/.github/workflows/backend_ci.yml index b5fe99e8..7b20b2f4 100644 --- a/.github/workflows/backend_ci.yml +++ b/.github/workflows/backend_ci.yml @@ -55,7 +55,7 @@ jobs: - name: Get teamMember id: teamMember run: | - echo "ASSIGNEE_SLACK_ID=${{ env[github.event.pull_request.assignees] }}" >> $GITHUB_ENV + echo "ASSIGNEE_SLACK_ID=${{ env[github.event.pull_request.assigned] }}" >> $GITHUB_ENV # - name: Get teamMember List # id: teamMembers diff --git a/backend/src/main/java/develup/api/AuthApi.java b/backend/src/main/java/develup/api/AuthApi.java index d2af9434..046b2d54 100644 --- a/backend/src/main/java/develup/api/AuthApi.java +++ b/backend/src/main/java/develup/api/AuthApi.java @@ -14,8 +14,7 @@ @RestController public class AuthApi { - - // + //t private final GithubOAuthService githubOAuthService; private final MemberService memberService; private final AuthService authService; From 6d2f94c6e94852bff196660fa9997deebcab910e Mon Sep 17 00:00:00 2001 From: yoonseo choi Date: Wed, 24 Jul 2024 16:07:04 +0900 Subject: [PATCH 14/21] =?UTF-8?q?fix:=20pr=20assignees=20=ED=95=A0?= =?UTF-8?q?=EB=8B=B9=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/backend_ci.yml | 2 +- backend/src/main/java/develup/api/AuthApi.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/backend_ci.yml b/.github/workflows/backend_ci.yml index 7b20b2f4..36236aec 100644 --- a/.github/workflows/backend_ci.yml +++ b/.github/workflows/backend_ci.yml @@ -55,7 +55,7 @@ jobs: - name: Get teamMember id: teamMember run: | - echo "ASSIGNEE_SLACK_ID=${{ env[github.event.pull_request.assigned] }}" >> $GITHUB_ENV + echo "ASSIGNEE_SLACK_ID=${{ env[github.event.pull_request.assignees.login] }}" >> $GITHUB_ENV # - name: Get teamMember List # id: teamMembers diff --git a/backend/src/main/java/develup/api/AuthApi.java b/backend/src/main/java/develup/api/AuthApi.java index 046b2d54..ca05443e 100644 --- a/backend/src/main/java/develup/api/AuthApi.java +++ b/backend/src/main/java/develup/api/AuthApi.java @@ -14,7 +14,7 @@ @RestController public class AuthApi { - //t + //te private final GithubOAuthService githubOAuthService; private final MemberService memberService; private final AuthService authService; From 55f741fdc8455efddb80be26a0ee76685c7a6af0 Mon Sep 17 00:00:00 2001 From: yoonseo choi Date: Wed, 24 Jul 2024 16:13:28 +0900 Subject: [PATCH 15/21] =?UTF-8?q?fix:=20pr=20assignee=20=ED=95=A0=EB=8B=B9?= =?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/backend_ci.yml | 2 +- backend/src/main/java/develup/api/AuthApi.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/backend_ci.yml b/.github/workflows/backend_ci.yml index 36236aec..eafc5a63 100644 --- a/.github/workflows/backend_ci.yml +++ b/.github/workflows/backend_ci.yml @@ -55,7 +55,7 @@ jobs: - name: Get teamMember id: teamMember run: | - echo "ASSIGNEE_SLACK_ID=${{ env[github.event.pull_request.assignees.login] }}" >> $GITHUB_ENV + echo "ASSIGNEE_SLACK_ID=${{ env[github.event.pull_request.login] }}" >> $GITHUB_ENV # - name: Get teamMember List # id: teamMembers diff --git a/backend/src/main/java/develup/api/AuthApi.java b/backend/src/main/java/develup/api/AuthApi.java index ca05443e..463e1d52 100644 --- a/backend/src/main/java/develup/api/AuthApi.java +++ b/backend/src/main/java/develup/api/AuthApi.java @@ -14,7 +14,7 @@ @RestController public class AuthApi { - //te + //tes private final GithubOAuthService githubOAuthService; private final MemberService memberService; private final AuthService authService; From 7cf9a6b6ba6d532f85f126db3da6e87b7b4f7556 Mon Sep 17 00:00:00 2001 From: yoonseo choi Date: Wed, 24 Jul 2024 16:17:24 +0900 Subject: [PATCH 16/21] =?UTF-8?q?fix:=20env=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/backend_ci.yml | 1 + backend/src/main/java/develup/api/AuthApi.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/backend_ci.yml b/.github/workflows/backend_ci.yml index eafc5a63..9d5969f9 100644 --- a/.github/workflows/backend_ci.yml +++ b/.github/workflows/backend_ci.yml @@ -16,6 +16,7 @@ on: env: lilychoibb: "U07AQJWU8S3" + U07AQJWU8S3: "릴리(최윤서)" jobs: BE_CI: diff --git a/backend/src/main/java/develup/api/AuthApi.java b/backend/src/main/java/develup/api/AuthApi.java index 463e1d52..944e8b69 100644 --- a/backend/src/main/java/develup/api/AuthApi.java +++ b/backend/src/main/java/develup/api/AuthApi.java @@ -14,7 +14,7 @@ @RestController public class AuthApi { - //tes + //test private final GithubOAuthService githubOAuthService; private final MemberService memberService; private final AuthService authService; From 55f60dfae5f79fe05daee69d6f91abc06317d6d9 Mon Sep 17 00:00:00 2001 From: yoonseo choi Date: Wed, 24 Jul 2024 16:24:51 +0900 Subject: [PATCH 17/21] =?UTF-8?q?refactor:=20pr=20assignee=20=EB=A5=BC=20s?= =?UTF-8?q?ender=20=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/backend_ci.yml | 12 +++++++++--- backend/src/main/java/develup/api/AuthApi.java | 2 +- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.github/workflows/backend_ci.yml b/.github/workflows/backend_ci.yml index 9d5969f9..7dfdc37d 100644 --- a/.github/workflows/backend_ci.yml +++ b/.github/workflows/backend_ci.yml @@ -16,7 +16,13 @@ on: env: lilychoibb: "U07AQJWU8S3" - U07AQJWU8S3: "릴리(최윤서)" + robinjoon: "U07BU02FQFJ" + brgndyy: "U07B53DM02W" + chosim-dvlpr: "U07BHP5UTLH" + Minjoo522: "U07B4V80WLT" + alstn113: "U07AQK2KBLP" + le2sky: "U07B26581CM" + Parkhanyoung: "U07BTSGKCC8" jobs: BE_CI: @@ -56,7 +62,7 @@ jobs: - name: Get teamMember id: teamMember run: | - echo "ASSIGNEE_SLACK_ID=${{ env[github.event.pull_request.login] }}" >> $GITHUB_ENV + echo "SENDER_SLACK_ID=${{ env[github.event.sender.login] }}" >> $GITHUB_ENV # - name: Get teamMember List # id: teamMembers @@ -84,7 +90,7 @@ jobs: "type": "section", "text": { "type": "mrkdwn", - "text": "pr 테스트 ${{ needs.BE_CI.result }} \n • 링크: <${{ github.event.pull_request.html_url }}|${{ github.event.pull_request.title }}> \n • pr 담당자: <@${{ env.ASSIGNEE_SLACK_ID }}>" + "text": "pr 테스트 ${{ needs.BE_CI.result }} \n • 링크: <${{ github.event.pull_request.html_url }}|${{ github.event.pull_request.title }}> \n • pr 담당자: <@${{ env.SENDER_SLACK_ID }}>" } } ] diff --git a/backend/src/main/java/develup/api/AuthApi.java b/backend/src/main/java/develup/api/AuthApi.java index 944e8b69..689c02d1 100644 --- a/backend/src/main/java/develup/api/AuthApi.java +++ b/backend/src/main/java/develup/api/AuthApi.java @@ -14,7 +14,7 @@ @RestController public class AuthApi { - //test + //test1 private final GithubOAuthService githubOAuthService; private final MemberService memberService; private final AuthService authService; From 7bccc046d3e5d458c6746519143533e9ccb6bc90 Mon Sep 17 00:00:00 2001 From: yoonseo choi Date: Wed, 24 Jul 2024 16:29:07 +0900 Subject: [PATCH 18/21] =?UTF-8?q?refactor:=20sender=20=EB=A5=BC=20assignee?= =?UTF-8?q?=20=EB=A1=9C=20=EB=B3=80=EA=B2=BD=20=ED=85=8C=EC=8A=A4=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/backend_ci.yml | 4 ++-- backend/src/main/java/develup/api/AuthApi.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/backend_ci.yml b/.github/workflows/backend_ci.yml index 7dfdc37d..3166d8a1 100644 --- a/.github/workflows/backend_ci.yml +++ b/.github/workflows/backend_ci.yml @@ -62,7 +62,7 @@ jobs: - name: Get teamMember id: teamMember run: | - echo "SENDER_SLACK_ID=${{ env[github.event.sender.login] }}" >> $GITHUB_ENV + echo "ASSIGNEE_SLACK_ID=${{ env[github.event.pull_request.login] }}" >> $GITHUB_ENV # - name: Get teamMember List # id: teamMembers @@ -90,7 +90,7 @@ jobs: "type": "section", "text": { "type": "mrkdwn", - "text": "pr 테스트 ${{ needs.BE_CI.result }} \n • 링크: <${{ github.event.pull_request.html_url }}|${{ github.event.pull_request.title }}> \n • pr 담당자: <@${{ env.SENDER_SLACK_ID }}>" + "text": "pr 테스트 ${{ needs.BE_CI.result }} \n • 링크: <${{ github.event.pull_request.html_url }}|${{ github.event.pull_request.title }}> \n • pr 담당자: <@${{ env.ASSIGNEE_SLACK_ID }}>" } } ] diff --git a/backend/src/main/java/develup/api/AuthApi.java b/backend/src/main/java/develup/api/AuthApi.java index 689c02d1..34419b5d 100644 --- a/backend/src/main/java/develup/api/AuthApi.java +++ b/backend/src/main/java/develup/api/AuthApi.java @@ -14,7 +14,7 @@ @RestController public class AuthApi { - //test1 + //test12 private final GithubOAuthService githubOAuthService; private final MemberService memberService; private final AuthService authService; From afdef5cf9d34c730402419998b95da950538293f Mon Sep 17 00:00:00 2001 From: yoonseo choi Date: Wed, 24 Jul 2024 16:32:07 +0900 Subject: [PATCH 19/21] =?UTF-8?q?refactor:=20sender=20=EB=A1=9C=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/backend_ci.yml | 18 ++---------------- .github/workflows/teamMember.json | 10 ---------- backend/src/main/java/develup/api/AuthApi.java | 2 +- 3 files changed, 3 insertions(+), 27 deletions(-) delete mode 100644 .github/workflows/teamMember.json diff --git a/.github/workflows/backend_ci.yml b/.github/workflows/backend_ci.yml index 3166d8a1..5f33ef62 100644 --- a/.github/workflows/backend_ci.yml +++ b/.github/workflows/backend_ci.yml @@ -62,21 +62,7 @@ jobs: - name: Get teamMember id: teamMember run: | - echo "ASSIGNEE_SLACK_ID=${{ env[github.event.pull_request.login] }}" >> $GITHUB_ENV - -# - name: Get teamMember List -# id: teamMembers -# uses: actions/github-script@v6 -# with: -# script: | -# const fs = require('fs'); -# const workers = JSON.parse(fs.readFileSync('.github/workflows/teamMember.json')); -# const mention = context.payload.pull_request.assignees.map((user) => { -# const login = user.login; -# const mappedValue = workers[login]; -# return mappedValue ? `<@${mappedValue}>` : `No mapping found for ${login}`; -# }) -# return mention.join(', '); + echo "SENDER_SLACK_ID=${{ env[github.event.sender.login] }}" >> $GITHUB_ENV - name: Slack mention uses: slackapi/slack-github-action@v1.24.0 @@ -90,7 +76,7 @@ jobs: "type": "section", "text": { "type": "mrkdwn", - "text": "pr 테스트 ${{ needs.BE_CI.result }} \n • 링크: <${{ github.event.pull_request.html_url }}|${{ github.event.pull_request.title }}> \n • pr 담당자: <@${{ env.ASSIGNEE_SLACK_ID }}>" + "text": "pr 테스트 ${{ needs.BE_CI.result }} \n • 링크: <${{ github.event.pull_request.html_url }}|${{ github.event.pull_request.title }}> \n • pr 담당자: <@${{ env.SENDER_SLACK_ID }}>" } } ] diff --git a/.github/workflows/teamMember.json b/.github/workflows/teamMember.json deleted file mode 100644 index 3b1e4e0f..00000000 --- a/.github/workflows/teamMember.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "lilychoibb": "U07AQJWU8S3", - "robinjoon": "U07BU02FQFJ", - "brgndyy" : "U07B53DM02W", - "chosim-dvlpr": "U07BHP5UTLH", - "Minjoo522": "U07B4V80WLT", - "alstn113": "U07AQK2KBLP", - "le2sky": "U07B26581CM", - "Parkhanyoung": "U07BTSGKCC8" -} diff --git a/backend/src/main/java/develup/api/AuthApi.java b/backend/src/main/java/develup/api/AuthApi.java index 34419b5d..33923091 100644 --- a/backend/src/main/java/develup/api/AuthApi.java +++ b/backend/src/main/java/develup/api/AuthApi.java @@ -14,7 +14,7 @@ @RestController public class AuthApi { - //test12 + //test123 private final GithubOAuthService githubOAuthService; private final MemberService memberService; private final AuthService authService; From c7fe6baaf48b57e5f4ae3fa419d7232f12538a0d Mon Sep 17 00:00:00 2001 From: yoonseo choi Date: Wed, 24 Jul 2024 16:33:52 +0900 Subject: [PATCH 20/21] =?UTF-8?q?refactor:=20=EB=B6=88=ED=95=84=EC=9A=94?= =?UTF-8?q?=ED=95=9C=20=EC=A3=BC=EC=84=9D=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/src/main/java/develup/api/AuthApi.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/main/java/develup/api/AuthApi.java b/backend/src/main/java/develup/api/AuthApi.java index 33923091..f65c30f7 100644 --- a/backend/src/main/java/develup/api/AuthApi.java +++ b/backend/src/main/java/develup/api/AuthApi.java @@ -14,7 +14,7 @@ @RestController public class AuthApi { - //test123 + private final GithubOAuthService githubOAuthService; private final MemberService memberService; private final AuthService authService; From b0a1f9dc0b40eae7c66c4e9043071b8763f5f155 Mon Sep 17 00:00:00 2001 From: yoonseo choi Date: Wed, 24 Jul 2024 16:37:40 +0900 Subject: [PATCH 21/21] =?UTF-8?q?refactor:=20=EB=B6=88=ED=95=84=EC=9A=94?= =?UTF-8?q?=ED=95=9C=20=EC=A3=BC=EC=84=9D=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/backend_ci.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.github/workflows/backend_ci.yml b/.github/workflows/backend_ci.yml index 5f33ef62..23fd7769 100644 --- a/.github/workflows/backend_ci.yml +++ b/.github/workflows/backend_ci.yml @@ -1,10 +1,3 @@ -# This workflow uses actions that are not certified by GitHub. -# They are provided by a third-party and are governed by -# separate terms of service, privacy policy, and support -# documentation. -# This workflow will build a package using Gradle and then publish it to GitHub packages when a release is created -# For more information see: https://github.com/actions/setup-java/blob/main/docs/advanced-usage.md#Publishing-using-gradle - name: BACKEND_CI on: