From 88cffb3bf6a70ae980dc3eeb76185cce9cf2c955 Mon Sep 17 00:00:00 2001 From: minsuKang <90169703+minchodang@users.noreply.github.com> Date: Wed, 7 Aug 2024 00:01:19 +0900 Subject: [PATCH] Feat: dependa bot sync (#31) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Fix: sync-upstream yml * Fix: optional delete * Fix: sync-upstream yml fork url * Fix: sync-upstream yml 2차 수정 * Fix: sync-upstream yml 3차 수정 * Update README.md * Update README.md * Fix: sync-upstream dependa-bot --- .github/PULL_REQUEST_TEMPLATE.md | 13 ++++++ .github/dependabot.yml | 13 ++++++ .../workflows/dependabot-pr-notification.yml | 18 ++++++++ .github/workflows/sync-upstream.yml | 44 ------------------- README.md | 4 +- src/auth/strategy/kakao.strategy.ts | 2 - 6 files changed, 47 insertions(+), 47 deletions(-) create mode 100644 .github/PULL_REQUEST_TEMPLATE.md create mode 100644 .github/dependabot.yml create mode 100644 .github/workflows/dependabot-pr-notification.yml delete mode 100644 .github/workflows/sync-upstream.yml diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 0000000..43f53bc --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1,13 @@ +## Dependabot 업데이트 PR + +이 PR은 Dependabot에 의해 자동으로 생성되었습니다. + +### 체크리스트 + +- [ ] 변경된 패키지의 변경 로그를 확인했습니까? +- [ ] 주요 변경 사항이 있는 경우, 애플리케이션에 미치는 영향을 검토했습니까? +- [ ] 필요한 경우, 관련 테스트를 실행하고 통과했습니까? + +### 추가 정보 + +(필요한 경우 여기에 추가 정보를 기재해 주세요) diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000..c7a1324 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,13 @@ +version: 2 +updates: + - package-ecosystem: 'github-actions' + directory: '/' + schedule: + interval: 'daily' + commit-message: + prefix: 'sync' + open-pull-requests-limit: 5 + target-branch: 'main' + source: + repo: 'kode-krew/meta-test-be' + branch: 'main' diff --git a/.github/workflows/dependabot-pr-notification.yml b/.github/workflows/dependabot-pr-notification.yml new file mode 100644 index 0000000..88f1a17 --- /dev/null +++ b/.github/workflows/dependabot-pr-notification.yml @@ -0,0 +1,18 @@ +name: Dependabot PR Notification + +on: + pull_request: + types: [opened, reopened, synchronize] + +jobs: + notify: + runs-on: ubuntu-latest + if: github.actor == 'dependabot[bot]' + steps: + - name: Notify team about Dependabot PR + uses: 8398a7/action-slack@v3 + with: + status: ${{ job.status }} + text: 'New Dependabot PR opened: ${{ github.event.pull_request.html_url }}' + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/sync-upstream.yml b/.github/workflows/sync-upstream.yml deleted file mode 100644 index 224b774..0000000 --- a/.github/workflows/sync-upstream.yml +++ /dev/null @@ -1,44 +0,0 @@ -name: Sync Upstream - -on: - schedule: - - cron: '0 * * * *' # 매 시간마다 체크 - push: - branches: - - main - -jobs: - sync: - runs-on: ubuntu-latest - - steps: - - name: Checkout Upstream - uses: actions/checkout@v2 - with: - repository: meta-test-be - token: ${{ secrets.GITHUB_TOKEN }} - path: upstream - - - name: Checkout Fork - uses: actions/checkout@v2 - with: - token: ${{ secrets.GITHUB_TOKEN }} - path: fork - - - name: Sync Upstream to Fork - run: | - cd fork - git remote add upstream ../upstream - git fetch upstream - git checkout main - git merge upstream/main --no-commit --no-ff - - - name: Create Pull Request - uses: peter-evans/create-pull-request@v3 - with: - token: ${{ secrets.GITHUB_TOKEN }} - commit-message: 'Sync with upstream' - branch: sync-upstream - base: main - title: 'Sync with upstream' - body: 'This PR syncs the fork with upstream repository' diff --git a/README.md b/README.md index a31b8c4..a3a5a5e 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@ ## meta-test-be +## fork sync test2 + ### 프로젝트 설정 ```js git clone https://github.com/kode-krew/meta-test-be.git @@ -28,4 +30,4 @@ npm run start:dev ```js http://127.0.0.1:8000/api -``` \ No newline at end of file +``` diff --git a/src/auth/strategy/kakao.strategy.ts b/src/auth/strategy/kakao.strategy.ts index 4e65472..b528c49 100644 --- a/src/auth/strategy/kakao.strategy.ts +++ b/src/auth/strategy/kakao.strategy.ts @@ -6,8 +6,6 @@ export class KakaoStrategy extends PassportStrategy(Strategy, 'kakao') { constructor() { super({ clientID: process.env.KAKAO_CLIENT_ID, - //NOTE: 아래는 Optional - // clientSecret: process.env.KAKAO_CLIENT_SECRET, callbackURL: process.env.KAKAO_CALLBACK_URL, scope: ['account_email', 'profile_nickname'], });