Skip to content

Commit

Permalink
브랜치간 커밋이력 동기화 (#439)
Browse files Browse the repository at this point in the history
Co-authored-by: 김관식 <[email protected]>
  • Loading branch information
limehee and gwansikk authored Aug 3, 2024
1 parent 9fabf0e commit 2ffe71c
Show file tree
Hide file tree
Showing 5 changed files with 115 additions and 16 deletions.
9 changes: 4 additions & 5 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,18 +1,17 @@
## Summary

> PR에 대한 목적을 한 줄 요약하여 여기에 작성해주세요.
> 관련 Issue를 태그해주세요.
추가적으로 간단한 설명을 해주세요.
**해당 PR에 대한 요약을 작성해주세요.**

## Tasks

- 해당 PR에 포함된 작업을 작성해주세요.
- 해당 PR에 포함된 작업을 작성해주세요.

## ETC

전달할 내용이 있다면 여기에 작성해주세요.
___(없을 경우 삭제) 관련하여 전달할 내용이 있다면 여기에 작성해주세요.___

## Screenshot

작업한 내용에 대한 스크린샷을 첨부해주세요.
___(없을 경우 삭제) 작업한 내용에 대한 스크린샷을 첨부해주세요.__
12 changes: 12 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# To get started with Dependabot version updates, you'll need to specify which
# package ecosystems to update and where the package manifests are located.
# Please see the documentation for all configuration options:
# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file

version: 2
updates:
- package-ecosystem: "gradle" # See documentation for possible values
directory: "/" # Location of package manifests
schedule:
interval: "weekly"
target-branch: "develop"
89 changes: 89 additions & 0 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
# For most projects, this workflow file will not need changing; you simply need
# to commit it to your repository.
#
# You may wish to alter this file to override the set of languages analyzed,
# or to provide custom queries or build logic.
#
# ******** NOTE ********
# We have attempted to detect the languages in your repository. Please check
# the `language` matrix defined below to confirm you have the correct set of
# supported CodeQL languages.
#
name: "CodeQL"

on:
push:
branches: [ "develop" ]
pull_request:
branches: [ "develop" ]
schedule:
- cron: '33 15 * * 2'

jobs:
analyze:
name: Analyze (${{ matrix.language }})
# Runner size impacts CodeQL analysis time. To learn more, please see:
# - https://gh.io/recommended-hardware-resources-for-running-codeql
# - https://gh.io/supported-runners-and-hardware-resources
# - https://gh.io/using-larger-runners (GitHub.com only)
# Consider using larger runners or machines with greater resources for possible analysis time improvements.
runs-on: ubuntu-latest
timeout-minutes: 360
permissions:
# required for all workflows
security-events: write

# required to fetch internal or private CodeQL packs
packages: read

# only required for workflows in private repositories
actions: read
contents: read

strategy:
fail-fast: false
matrix:
include:
- language: java
build-mode: manual # This mode only analyzes Java. Set this to 'autobuild' or 'manual' to analyze Kotlin too.
# CodeQL supports the following values keywords for 'language': 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'swift'
# Use `c-cpp` to analyze code written in C, C++ or both
# Use 'java-kotlin' to analyze code written in Java, Kotlin or both
# Use 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both
# To learn more about changing the languages that are analyzed or customizing the build mode for your analysis,
# see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning.
# If you are analyzing a compiled language, you can modify the 'build-mode' for that language to customize how
# your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages
steps:
- name: Checkout repository
uses: actions/checkout@v4

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}
build-mode: ${{ matrix.build-mode }}
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.

# For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
# queries: security-extended,security-and-quality

# If the analyze step fails for one of the languages you are analyzing with
# "We were unable to automatically build your code", modify the matrix above
# to set the build mode to "manual" for that language. Then modify this step
# to build your code.
# ℹ️ Command-line programs to run using the OS shell.
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
- if: matrix.build-mode == 'manual'
name: Build project
shell: bash
run: |
./gradlew clean build
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v3
with:
category: "/language:${{matrix.language}}"
5 changes: 4 additions & 1 deletion .github/workflows/spring-boot-gradle-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
- uses: actions/checkout@v4

- name: Set up JDK 21
uses: actions/setup-java@v4.2.1
uses: actions/setup-java@v4
with:
java-version: '21'
distribution: 'adopt'
Expand All @@ -19,5 +19,8 @@ jobs:
- name: Grant execute permission for gradlew
run: chmod +x gradlew

- name: Clean with Gradle
run: ./gradlew clean

- name: Build with Gradle
run: ./gradlew build
16 changes: 6 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@

해당 프로젝트는 C-Lab의 활동을 지원하고, 회원들 간의 소통을 원활하게 하기 위해 개발되었습니다.

## Contributors

<a href="https://github.com/KGU-C-Lab/clab-server/graphs/contributors">
<img src="https://contrib.rocks/image?repo=KGU-C-Lab/clab-server" />
</a>

## Tech Stack

- **Spring Boot**: 웹 및 애플리케이션 개발을 위한 프레임워크.
Expand Down Expand Up @@ -58,13 +64,3 @@
본 프로젝트에 기여하고자 하시는 분은 다음의 가이드라인을 따라주세요.

[CONTRIBUTING.md](CONTRIBUTING.md)

## Contributors

- [한관희](https://github.com/limehee)
- [전민주](https://github.com/mingmingmon)
- [이한음](https://github.com/LeeHanEum)
- [김관식](https://github.com/gwansikk)

기여해 주신 모든 분들께 감사드립니다.

0 comments on commit 2ffe71c

Please sign in to comment.