From 73d9e0e3fb162a769c261499e57b82c256e7bcb6 Mon Sep 17 00:00:00 2001 From: jaeyeon kim Date: Tue, 15 Mar 2022 15:47:39 +0900 Subject: [PATCH 01/75] #25 github action test --- .github/workflows/main.yml | 42 +++++++++---------- .../dogvelopers/controller/HofController.java | 2 +- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 30a4bc1..9c88971 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,36 +1,36 @@ -# This is a basic workflow to help you get started with Actions +name: Spring build gradle -name: CI - -# Controls when the workflow will run on: - # Triggers the workflow on push or pull request events but only for the main branch push: branches: [ main ] pull_request: branches: [ main ] - # Allows you to run this workflow manually from the Actions tab - workflow_dispatch: +# workflow_dispatch: -# A workflow run is made up of one or more jobs that can run sequentially or in parallel jobs: - # This workflow contains a single job called "build" build: - # The type of runner that the job will run on runs-on: ubuntu-latest - - # Steps represent a sequence of tasks that will be executed as part of the job steps: - # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - uses: actions/checkout@v2 - # Runs a single command using the runners shell - - name: Run a one-line script - run: echo Hello, world! + # 소스코드들은 11을 위주로 짰음 + - name: Set up JDK 11 + uses: actions/setup-java@v1 + with: + java-version: 11 + + # Gradle wrapper 파일 실행 권한주기 + - name: Grant execute permission for gradlew + run: chmod +x gradlew + + # Gradle test를 실행한다 + - name: Test with Gradle + run: ./gradlew --info test - # Runs a set of commands using the runners shell - - name: Run a multi-line script - run: | - echo Add other actions to build, - echo test, and deploy your project. + # 테스트 후 Result를 보기위해 Publish Unit Test Results step 추가 + - name: Publish Unit Test Results + uses: EnricoMi/publish-unit-test-result-action@v1 + if: ${{ always() }} # 테스트가 실패하여도 Report를 보기 위해 `always`로 설정 + with: + files: build/test-results/**/*.xml # junit report xml 을 가르킴 diff --git a/dogvelopers/src/main/java/com/dogvelopers/dogvelopers/controller/HofController.java b/dogvelopers/src/main/java/com/dogvelopers/dogvelopers/controller/HofController.java index 18079b0..96087c0 100644 --- a/dogvelopers/src/main/java/com/dogvelopers/dogvelopers/controller/HofController.java +++ b/dogvelopers/src/main/java/com/dogvelopers/dogvelopers/controller/HofController.java @@ -13,7 +13,7 @@ @RestController @RequiredArgsConstructor @RequestMapping("hofs") -public class HofController { +public class HofController { private final HofService hofService; From 1ab9e53873f011f8f02765064525c207f528bce9 Mon Sep 17 00:00:00 2001 From: jaeyeon kim Date: Tue, 15 Mar 2022 16:00:34 +0900 Subject: [PATCH 02/75] #25 github actio test --- .../com/dogvelopers/dogvelopers/controller/HofController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dogvelopers/src/main/java/com/dogvelopers/dogvelopers/controller/HofController.java b/dogvelopers/src/main/java/com/dogvelopers/dogvelopers/controller/HofController.java index 96087c0..18079b0 100644 --- a/dogvelopers/src/main/java/com/dogvelopers/dogvelopers/controller/HofController.java +++ b/dogvelopers/src/main/java/com/dogvelopers/dogvelopers/controller/HofController.java @@ -13,7 +13,7 @@ @RestController @RequiredArgsConstructor @RequestMapping("hofs") -public class HofController { +public class HofController { private final HofService hofService; From 5bad231ddf271d20e35609381f42bc87b7c8ed0e Mon Sep 17 00:00:00 2001 From: jaeyeon kim Date: Tue, 15 Mar 2022 16:03:13 +0900 Subject: [PATCH 03/75] #25 github action test --- .github/workflows/main.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9c88971..79f3d5c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -2,7 +2,9 @@ name: Spring build gradle on: push: - branches: [ main ] + branches: + - main + - develop pull_request: branches: [ main ] From 7f276468c6f0ab108c3928df7dc0c0867f2a77df Mon Sep 17 00:00:00 2001 From: jaeyeon kim Date: Tue, 15 Mar 2022 16:05:32 +0900 Subject: [PATCH 04/75] #25 github action test --- .github/workflows/main.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 79f3d5c..006ba01 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -4,7 +4,7 @@ on: push: branches: - main - - develop +# - develop pull_request: branches: [ main ] @@ -22,6 +22,9 @@ jobs: with: java-version: 11 + - name: set gradle + - run: gradle wrapper + # Gradle wrapper 파일 실행 권한주기 - name: Grant execute permission for gradlew run: chmod +x gradlew From f565dde42eed7783f3372aa76a058eb7470dc63b Mon Sep 17 00:00:00 2001 From: jaeyeon kim Date: Tue, 15 Mar 2022 16:06:24 +0900 Subject: [PATCH 05/75] #25 github action test --- .github/workflows/main.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 006ba01..0d0b909 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -4,7 +4,8 @@ on: push: branches: - main -# - develop + - develop + pull_request: branches: [ main ] @@ -24,7 +25,7 @@ jobs: - name: set gradle - run: gradle wrapper - + # Gradle wrapper 파일 실행 권한주기 - name: Grant execute permission for gradlew run: chmod +x gradlew From f33077094230b365ac1329e0b5bde4b3f75556f6 Mon Sep 17 00:00:00 2001 From: jaeyeon kim Date: Tue, 15 Mar 2022 16:07:16 +0900 Subject: [PATCH 06/75] #25 github action test --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0d0b909..8e85f38 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -5,7 +5,7 @@ on: branches: - main - develop - + pull_request: branches: [ main ] @@ -24,7 +24,7 @@ jobs: java-version: 11 - name: set gradle - - run: gradle wrapper + run: gradle wrapper # Gradle wrapper 파일 실행 권한주기 - name: Grant execute permission for gradlew From a1ce788a66e6e59558aa51118a06489529ee3e1c Mon Sep 17 00:00:00 2001 From: jaeyeon kim Date: Tue, 15 Mar 2022 16:08:55 +0900 Subject: [PATCH 07/75] =?UTF-8?q?#25=20github=20action=20=EC=8B=A4?= =?UTF-8?q?=ED=96=89=20=EC=8B=A4=ED=8C=A8=ED=95=98=EB=8A=94=20gradle=20wra?= =?UTF-8?q?pper=20=EC=A7=80=EC=9A=B0=EA=B3=A0=20=EC=A7=84=ED=96=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/main.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8e85f38..3df18d3 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -23,12 +23,12 @@ jobs: with: java-version: 11 - - name: set gradle - run: gradle wrapper - - # Gradle wrapper 파일 실행 권한주기 - - name: Grant execute permission for gradlew - run: chmod +x gradlew +# - name: set gradle +# run: gradle wrapper +# +# # Gradle wrapper 파일 실행 권한주기 +# - name: Grant execute permission for gradlew +# run: chmod +x gradlew # Gradle test를 실행한다 - name: Test with Gradle From c3dd163e6f57c0bba68a4bb60cd1f8b53968df93 Mon Sep 17 00:00:00 2001 From: jaeyeon kim Date: Tue, 15 Mar 2022 16:10:01 +0900 Subject: [PATCH 08/75] =?UTF-8?q?#25=20github=20action=20test=20=ED=95=9C?= =?UTF-8?q?=EB=B2=88=20=EB=8D=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/main.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3df18d3..4a591d3 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -23,12 +23,12 @@ jobs: with: java-version: 11 -# - name: set gradle -# run: gradle wrapper -# -# # Gradle wrapper 파일 실행 권한주기 -# - name: Grant execute permission for gradlew -# run: chmod +x gradlew + - name: set gradle + run: ./gradlew wrapper + + # Gradle wrapper 파일 실행 권한주기 + - name: Grant execute permission for gradlew + run: chmod +x gradlew # Gradle test를 실행한다 - name: Test with Gradle From 0c686f41fbe63faa76ccb3c420fd6f59bc5dc4fc Mon Sep 17 00:00:00 2001 From: jaeyeon kim Date: Tue, 15 Mar 2022 16:11:44 +0900 Subject: [PATCH 09/75] #25 github action test --- .github/workflows/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4a591d3..fb508af 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -23,13 +23,13 @@ jobs: with: java-version: 11 - - name: set gradle - run: ./gradlew wrapper - # Gradle wrapper 파일 실행 권한주기 - name: Grant execute permission for gradlew run: chmod +x gradlew + - name: set gradle + run: ./gradlew wrapper + # Gradle test를 실행한다 - name: Test with Gradle run: ./gradlew --info test From f8ed0114a5a03d6ef63521b86db4df3387aff83b Mon Sep 17 00:00:00 2001 From: jaeyeon kim Date: Tue, 15 Mar 2022 16:38:08 +0900 Subject: [PATCH 10/75] #25 github action test --- .github/workflows/main.yml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index fb508af..e0b37b7 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -3,11 +3,11 @@ name: Spring build gradle on: push: branches: - - main - - develop + - develop # 내가 평소에 PR 하기 전 작업하는 branch 에다가 적용 pull_request: - branches: [ main ] + branches: + - main # pull request 시에 적용되는 branch 에다가 적용 # workflow_dispatch: @@ -17,6 +17,9 @@ jobs: steps: - uses: actions/checkout@v2 + env: + working-directory: ./dogvelopers # gradlew 가 있는 경로 설정 + # 소스코드들은 11을 위주로 짰음 - name: Set up JDK 11 uses: actions/setup-java@v1 @@ -27,8 +30,8 @@ jobs: - name: Grant execute permission for gradlew run: chmod +x gradlew - - name: set gradle - run: ./gradlew wrapper +# - name: set gradle +# run: ./gradlew wrapper # Gradle test를 실행한다 - name: Test with Gradle From 1999d8f2f526aed4ba39c64fa34b87069e0a6535 Mon Sep 17 00:00:00 2001 From: jaeyeon kim Date: Tue, 15 Mar 2022 16:43:49 +0900 Subject: [PATCH 11/75] #25 github action test --- .github/workflows/main.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e0b37b7..c175be7 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -14,11 +14,12 @@ on: jobs: build: runs-on: ubuntu-latest + env: + working-directory: ./dogvelopers # gradlew 가 있는 경로 설정 + steps: - uses: actions/checkout@v2 - env: - working-directory: ./dogvelopers # gradlew 가 있는 경로 설정 # 소스코드들은 11을 위주로 짰음 - name: Set up JDK 11 From 911c379bc6e33f0099ae8e2a3874e391ef5088b4 Mon Sep 17 00:00:00 2001 From: jaeyeon kim Date: Tue, 15 Mar 2022 16:46:34 +0900 Subject: [PATCH 12/75] #25 github action test --- .github/workflows/main.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c175be7..091c0fb 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -14,12 +14,13 @@ on: jobs: build: runs-on: ubuntu-latest - env: - working-directory: ./dogvelopers # gradlew 가 있는 경로 설정 steps: - uses: actions/checkout@v2 + - name : working directory 지정 + env: + working-directory: ./dogvelopers # gradlew 가 있는 경로 설정 # 소스코드들은 11을 위주로 짰음 - name: Set up JDK 11 From baf41388c79c2700396b7f8cb0ade342ce419d85 Mon Sep 17 00:00:00 2001 From: jaeyeon kim Date: Tue, 15 Mar 2022 16:47:17 +0900 Subject: [PATCH 13/75] #25 github action test --- .github/workflows/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 091c0fb..9cc6e0a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -18,9 +18,9 @@ jobs: steps: - uses: actions/checkout@v2 - - name : working directory 지정 - env: - working-directory: ./dogvelopers # gradlew 가 있는 경로 설정 +# - name : working directory 지정 +# env: +# working-directory: ./dogvelopers # gradlew 가 있는 경로 설정 # 소스코드들은 11을 위주로 짰음 - name: Set up JDK 11 From d84e444006fb3bbe43ea31ff27d94d949233b53b Mon Sep 17 00:00:00 2001 From: jaeyeon kim Date: Tue, 15 Mar 2022 16:49:10 +0900 Subject: [PATCH 14/75] #25 github action test --- .github/workflows/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9cc6e0a..091c0fb 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -18,9 +18,9 @@ jobs: steps: - uses: actions/checkout@v2 -# - name : working directory 지정 -# env: -# working-directory: ./dogvelopers # gradlew 가 있는 경로 설정 + - name : working directory 지정 + env: + working-directory: ./dogvelopers # gradlew 가 있는 경로 설정 # 소스코드들은 11을 위주로 짰음 - name: Set up JDK 11 From f1ae38a67a8fde11d273697aaeb4a36365ed5187 Mon Sep 17 00:00:00 2001 From: jaeyeon kim Date: Tue, 15 Mar 2022 16:50:15 +0900 Subject: [PATCH 15/75] #25 github action test --- .github/workflows/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 091c0fb..50687e7 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -19,6 +19,7 @@ jobs: - uses: actions/checkout@v2 - name : working directory 지정 + uses: env: working-directory: ./dogvelopers # gradlew 가 있는 경로 설정 From 259337498cbb9f02cd34852971f43662459b0f29 Mon Sep 17 00:00:00 2001 From: jaeyeon kim Date: Tue, 15 Mar 2022 16:50:49 +0900 Subject: [PATCH 16/75] #25 github action test --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 50687e7..0b98a17 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -19,7 +19,7 @@ jobs: - uses: actions/checkout@v2 - name : working directory 지정 - uses: + run: env: working-directory: ./dogvelopers # gradlew 가 있는 경로 설정 From 17989263a5add79f54992dba0115381866331449 Mon Sep 17 00:00:00 2001 From: jaeyeon kim Date: Tue, 15 Mar 2022 16:51:47 +0900 Subject: [PATCH 17/75] #25 github action test --- .github/workflows/main.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0b98a17..6c1ea7f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -20,7 +20,6 @@ jobs: - name : working directory 지정 run: - env: working-directory: ./dogvelopers # gradlew 가 있는 경로 설정 # 소스코드들은 11을 위주로 짰음 From 6b05928d23a330d7623a26ff4c162f119cd4d221 Mon Sep 17 00:00:00 2001 From: jaeyeon kim Date: Tue, 15 Mar 2022 16:52:25 +0900 Subject: [PATCH 18/75] #25 github action test --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6c1ea7f..e36ab1f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -19,7 +19,7 @@ jobs: - uses: actions/checkout@v2 - name : working directory 지정 - run: + uses: working-directory: ./dogvelopers # gradlew 가 있는 경로 설정 # 소스코드들은 11을 위주로 짰음 From 2cb4df34e0a99eb64e0118dddb2912f1ad0e1c6d Mon Sep 17 00:00:00 2001 From: jaeyeon kim Date: Tue, 15 Mar 2022 16:55:13 +0900 Subject: [PATCH 19/75] #25 github action test --- .github/workflows/main.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e36ab1f..85dd583 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -14,13 +14,15 @@ on: jobs: build: runs-on: ubuntu-latest + env: + working-directory: ./dogvelopers steps: - uses: actions/checkout@v2 - - name : working directory 지정 - uses: - working-directory: ./dogvelopers # gradlew 가 있는 경로 설정 +# - name : working directory 지정 +# uses: +# working-directory: ./dogvelopers # gradlew 가 있는 경로 설정 # 소스코드들은 11을 위주로 짰음 - name: Set up JDK 11 From f8a6038fd73be63bb1a04ae29aae65e4d5f5b29e Mon Sep 17 00:00:00 2001 From: jaeyeon kim Date: Tue, 15 Mar 2022 16:59:08 +0900 Subject: [PATCH 20/75] #25 github action test --- .github/workflows/main.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 85dd583..b739e7e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -30,6 +30,8 @@ jobs: with: java-version: 11 + - name: modify permission for gradlew + run: chmod 777 gradlew # Gradle wrapper 파일 실행 권한주기 - name: Grant execute permission for gradlew run: chmod +x gradlew From 34f2ae7adca1ba55de0c066fb2735fda56d48ae2 Mon Sep 17 00:00:00 2001 From: jaeyeon kim Date: Tue, 15 Mar 2022 16:59:50 +0900 Subject: [PATCH 21/75] #25 github action test --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b739e7e..e326b7d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -31,10 +31,10 @@ jobs: java-version: 11 - name: modify permission for gradlew - run: chmod 777 gradlew + run: chmod 777 ./gradlew # Gradle wrapper 파일 실행 권한주기 - name: Grant execute permission for gradlew - run: chmod +x gradlew + run: chmod +x ./gradlew # - name: set gradle # run: ./gradlew wrapper From ffb5989fbb5b405319305e2be51c7df1b77d009c Mon Sep 17 00:00:00 2001 From: jaeyeon kim Date: Tue, 15 Mar 2022 17:01:33 +0900 Subject: [PATCH 22/75] #25 github action test --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e326b7d..a60a745 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -31,7 +31,7 @@ jobs: java-version: 11 - name: modify permission for gradlew - run: chmod 777 ./gradlew + run: pwd # Gradle wrapper 파일 실행 권한주기 - name: Grant execute permission for gradlew run: chmod +x ./gradlew From b26c45c2da3744d985a654861d02bd308d40a008 Mon Sep 17 00:00:00 2001 From: jaeyeon kim Date: Tue, 15 Mar 2022 17:04:13 +0900 Subject: [PATCH 23/75] #25 github action test --- .github/workflows/main.yml | 2 +- cat | 0 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 cat diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a60a745..bfab950 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -31,7 +31,7 @@ jobs: java-version: 11 - name: modify permission for gradlew - run: pwd + run: cd ./dogvelopers # Gradle wrapper 파일 실행 권한주기 - name: Grant execute permission for gradlew run: chmod +x ./gradlew diff --git a/cat b/cat new file mode 100644 index 0000000..e69de29 From b2a828f006e07c5c3955e39aa43f0e831333a079 Mon Sep 17 00:00:00 2001 From: jaeyeon kim Date: Tue, 15 Mar 2022 17:05:17 +0900 Subject: [PATCH 24/75] #25 github action test --- .github/workflows/main.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index bfab950..e97a6a8 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -31,8 +31,12 @@ jobs: java-version: 11 - name: modify permission for gradlew - run: cd ./dogvelopers + run: cd ./dogvelopers # Gradle wrapper 파일 실행 권한주기 + + - name: location check + run: pwd + - name: Grant execute permission for gradlew run: chmod +x ./gradlew From fe1cf8fd53deeadc98ecb7e07042bd6675f748cb Mon Sep 17 00:00:00 2001 From: jaeyeon kim Date: Tue, 15 Mar 2022 17:07:24 +0900 Subject: [PATCH 25/75] #25 github action test --- .github/workflows/main.yml | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e97a6a8..c5719a2 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -30,22 +30,19 @@ jobs: with: java-version: 11 - - name: modify permission for gradlew - run: cd ./dogvelopers - # Gradle wrapper 파일 실행 권한주기 +# - name: modify permission for gradlew +# run: chmod 777 gradlew - - name: location check - run: pwd - + # Gradle wrapper 파일 실행 권한주기 - name: Grant execute permission for gradlew - run: chmod +x ./gradlew + run: chmod +x ./dogvelopers/gradlew # - name: set gradle # run: ./gradlew wrapper # Gradle test를 실행한다 - name: Test with Gradle - run: ./gradlew --info test + run: ./dogvelopers/gradlew --info test # 테스트 후 Result를 보기위해 Publish Unit Test Results step 추가 - name: Publish Unit Test Results From 782fdd6ba9d718dcc44673fbfa2c577e1c30e4b0 Mon Sep 17 00:00:00 2001 From: jaeyeon kim Date: Tue, 15 Mar 2022 17:10:27 +0900 Subject: [PATCH 26/75] #25 github action test --- .github/workflows/main.yml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c5719a2..0cb426e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -20,26 +20,16 @@ jobs: steps: - uses: actions/checkout@v2 -# - name : working directory 지정 -# uses: -# working-directory: ./dogvelopers # gradlew 가 있는 경로 설정 - # 소스코드들은 11을 위주로 짰음 - name: Set up JDK 11 uses: actions/setup-java@v1 with: java-version: 11 -# - name: modify permission for gradlew -# run: chmod 777 gradlew - # Gradle wrapper 파일 실행 권한주기 - name: Grant execute permission for gradlew run: chmod +x ./dogvelopers/gradlew -# - name: set gradle -# run: ./gradlew wrapper - # Gradle test를 실행한다 - name: Test with Gradle run: ./dogvelopers/gradlew --info test From 90f429354df8655661e60c90d5f63dd95090f078 Mon Sep 17 00:00:00 2001 From: jaeyeon kim Date: Tue, 15 Mar 2022 17:14:55 +0900 Subject: [PATCH 27/75] #25 github action test --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0cb426e..ac96156 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -15,7 +15,7 @@ jobs: build: runs-on: ubuntu-latest env: - working-directory: ./dogvelopers + working-directory: /home/runner/work/dogVelopersServer/dogVelopersServer/dogvelopers steps: - uses: actions/checkout@v2 From d8676b3360cec584e5360b0239e96fedd69ba4cc Mon Sep 17 00:00:00 2001 From: jaeyeon kim Date: Tue, 15 Mar 2022 17:16:08 +0900 Subject: [PATCH 28/75] #25 github action test --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ac96156..1d317a1 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -32,7 +32,7 @@ jobs: # Gradle test를 실행한다 - name: Test with Gradle - run: ./dogvelopers/gradlew --info test + run: ./dogvelopers/gradlew test # 테스트 후 Result를 보기위해 Publish Unit Test Results step 추가 - name: Publish Unit Test Results From 1c1ef0287d0df79b133418e67ebe17aa63b5764f Mon Sep 17 00:00:00 2001 From: jaeyeon kim Date: Tue, 15 Mar 2022 17:19:24 +0900 Subject: [PATCH 29/75] #25 github action test --- .github/workflows/main.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1d317a1..0563b61 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -28,11 +28,13 @@ jobs: # Gradle wrapper 파일 실행 권한주기 - name: Grant execute permission for gradlew - run: chmod +x ./dogvelopers/gradlew + run: chmod +x gradlew + working-directory: ${{ env.working-directory }} # Gradle test를 실행한다 - name: Test with Gradle - run: ./dogvelopers/gradlew test + run: gradlew test + working-directory: ${{ env.working-directory }} # 테스트 후 Result를 보기위해 Publish Unit Test Results step 추가 - name: Publish Unit Test Results @@ -40,3 +42,4 @@ jobs: if: ${{ always() }} # 테스트가 실패하여도 Report를 보기 위해 `always`로 설정 with: files: build/test-results/**/*.xml # junit report xml 을 가르킴 + working-directory: ${{ env.working-directory }} From 1bf7fd56bba0d8dfca3026b6b41d7da0bdc8b2dd Mon Sep 17 00:00:00 2001 From: jaeyeon kim Date: Tue, 15 Mar 2022 17:20:23 +0900 Subject: [PATCH 30/75] #25 github action test --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0563b61..ab61e09 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -39,7 +39,7 @@ jobs: # 테스트 후 Result를 보기위해 Publish Unit Test Results step 추가 - name: Publish Unit Test Results uses: EnricoMi/publish-unit-test-result-action@v1 + working-directory: ${{ env.working-directory }} if: ${{ always() }} # 테스트가 실패하여도 Report를 보기 위해 `always`로 설정 with: files: build/test-results/**/*.xml # junit report xml 을 가르킴 - working-directory: ${{ env.working-directory }} From 6fa50c5b8e576ee8768bfac311cf9640f7ff9d26 Mon Sep 17 00:00:00 2001 From: jaeyeon kim Date: Tue, 15 Mar 2022 17:20:52 +0900 Subject: [PATCH 31/75] #25 github action test --- .github/workflows/main.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ab61e09..cb69ce3 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -39,7 +39,6 @@ jobs: # 테스트 후 Result를 보기위해 Publish Unit Test Results step 추가 - name: Publish Unit Test Results uses: EnricoMi/publish-unit-test-result-action@v1 - working-directory: ${{ env.working-directory }} if: ${{ always() }} # 테스트가 실패하여도 Report를 보기 위해 `always`로 설정 with: files: build/test-results/**/*.xml # junit report xml 을 가르킴 From 8125edd56a69831e414c5c211ad08c77b3d19221 Mon Sep 17 00:00:00 2001 From: jaeyeon kim Date: Tue, 15 Mar 2022 17:22:40 +0900 Subject: [PATCH 32/75] #25 github action test --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index cb69ce3..2b2bb51 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -33,7 +33,7 @@ jobs: # Gradle test를 실행한다 - name: Test with Gradle - run: gradlew test + run: ./gradlew test working-directory: ${{ env.working-directory }} # 테스트 후 Result를 보기위해 Publish Unit Test Results step 추가 From 97bc9f19c30123809764346e0c530d218d248132 Mon Sep 17 00:00:00 2001 From: jaeyeon kim Date: Tue, 15 Mar 2022 17:27:24 +0900 Subject: [PATCH 33/75] #25 github action test --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2b2bb51..5b2cec6 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -33,7 +33,7 @@ jobs: # Gradle test를 실행한다 - name: Test with Gradle - run: ./gradlew test + run: ./gradlew --debug test working-directory: ${{ env.working-directory }} # 테스트 후 Result를 보기위해 Publish Unit Test Results step 추가 From db5251894eed1bbc5fc3871d02e0336ae43d9194 Mon Sep 17 00:00:00 2001 From: jaeyeon kim Date: Tue, 15 Mar 2022 17:33:41 +0900 Subject: [PATCH 34/75] #25 github action test --- .github/workflows/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5b2cec6..a5dbf14 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -39,6 +39,7 @@ jobs: # 테스트 후 Result를 보기위해 Publish Unit Test Results step 추가 - name: Publish Unit Test Results uses: EnricoMi/publish-unit-test-result-action@v1 + working-directory: ${{ env.working-directory }} if: ${{ always() }} # 테스트가 실패하여도 Report를 보기 위해 `always`로 설정 with: files: build/test-results/**/*.xml # junit report xml 을 가르킴 From dda5a132cadc6190c23d73c03ec8ba65140b4fbb Mon Sep 17 00:00:00 2001 From: jaeyeon kim Date: Tue, 15 Mar 2022 17:35:05 +0900 Subject: [PATCH 35/75] #25 github action test --- .github/workflows/main.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a5dbf14..9776b76 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -39,7 +39,6 @@ jobs: # 테스트 후 Result를 보기위해 Publish Unit Test Results step 추가 - name: Publish Unit Test Results uses: EnricoMi/publish-unit-test-result-action@v1 - working-directory: ${{ env.working-directory }} if: ${{ always() }} # 테스트가 실패하여도 Report를 보기 위해 `always`로 설정 with: - files: build/test-results/**/*.xml # junit report xml 을 가르킴 + files: /home/runner/work/dogVelopersServer/dogVelopersServer/dogvelopers/build/test-results/**/*.xml # junit report xml 을 가르킴 From 862ae2b8928b24d9772b251112354a37924b8387 Mon Sep 17 00:00:00 2001 From: jaeyeon kim Date: Tue, 15 Mar 2022 17:36:32 +0900 Subject: [PATCH 36/75] #25 github action test --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9776b76..6473f46 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -41,4 +41,4 @@ jobs: uses: EnricoMi/publish-unit-test-result-action@v1 if: ${{ always() }} # 테스트가 실패하여도 Report를 보기 위해 `always`로 설정 with: - files: /home/runner/work/dogVelopersServer/dogVelopersServer/dogvelopers/build/test-results/**/*.xml # junit report xml 을 가르킴 + files: dogvelopers/build/test-results/**/*.xml # junit report xml 을 가르킴 From 23c748f223f601819a77763e3dc46ca9043604fa Mon Sep 17 00:00:00 2001 From: jaeyeon kim Date: Tue, 15 Mar 2022 19:35:42 +0900 Subject: [PATCH 37/75] #25 github action test --- .github/workflows/main.yml | 11 ++++++++++- dogvelopers/build.gradle | 6 ++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6473f46..762b6e3 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -16,6 +16,7 @@ jobs: runs-on: ubuntu-latest env: working-directory: /home/runner/work/dogVelopersServer/dogVelopersServer/dogvelopers + key: {secrets.KEY} steps: - uses: actions/checkout@v2 @@ -33,7 +34,7 @@ jobs: # Gradle test를 실행한다 - name: Test with Gradle - run: ./gradlew --debug test + run: ./gradlew test working-directory: ${{ env.working-directory }} # 테스트 후 Result를 보기위해 Publish Unit Test Results step 추가 @@ -42,3 +43,11 @@ jobs: if: ${{ always() }} # 테스트가 실패하여도 Report를 보기 위해 `always`로 설정 with: files: dogvelopers/build/test-results/**/*.xml # junit report xml 을 가르킴 + + - name: gradle build + run: ./gradlew build + working-directory: ${{ env.working-directory }} + + - name: send to aws + run: scp -i $key ~/Desktop/dogvelopers.jar ubuntu@54.180.208.212:~/daemon + diff --git a/dogvelopers/build.gradle b/dogvelopers/build.gradle index 15abe79..379de0a 100644 --- a/dogvelopers/build.gradle +++ b/dogvelopers/build.gradle @@ -46,6 +46,12 @@ springBoot { mainClass = 'com.dogvelopers.dogvelopers.DogvelopersApplication' // build 시 main class 를 찾아주기 위함 } +bootJar{ + archivesBaseName = 'dogvelopers' + archiveFileName = 'dogvelopers.jar' + archiveVersion = "0.0.1" +} + test { useJUnitPlatform() // 이 의존성이 있어야지 , github action 시에 test 돌릴 수 있음 } \ No newline at end of file From 8b1d582c8af39fc32d719d845e5416224fe2212b Mon Sep 17 00:00:00 2001 From: jaeyeon kim Date: Tue, 15 Mar 2022 19:36:36 +0900 Subject: [PATCH 38/75] #25 github action test --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 762b6e3..4bd120f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -16,7 +16,7 @@ jobs: runs-on: ubuntu-latest env: working-directory: /home/runner/work/dogVelopersServer/dogVelopersServer/dogvelopers - key: {secrets.KEY} + key: ${{ secrets.KEY }} steps: - uses: actions/checkout@v2 From 966744a60fd88ace06e06489a52cb4cd8b2369ff Mon Sep 17 00:00:00 2001 From: jaeyeon kim Date: Tue, 15 Mar 2022 20:25:40 +0900 Subject: [PATCH 39/75] #25 github action test --- .github/workflows/main.yml | 53 -------------------------------------- 1 file changed, 53 deletions(-) delete mode 100644 .github/workflows/main.yml diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml deleted file mode 100644 index 4bd120f..0000000 --- a/.github/workflows/main.yml +++ /dev/null @@ -1,53 +0,0 @@ -name: Spring build gradle - -on: - push: - branches: - - develop # 내가 평소에 PR 하기 전 작업하는 branch 에다가 적용 - - pull_request: - branches: - - main # pull request 시에 적용되는 branch 에다가 적용 - -# workflow_dispatch: - -jobs: - build: - runs-on: ubuntu-latest - env: - working-directory: /home/runner/work/dogVelopersServer/dogVelopersServer/dogvelopers - key: ${{ secrets.KEY }} - - steps: - - uses: actions/checkout@v2 - - # 소스코드들은 11을 위주로 짰음 - - name: Set up JDK 11 - uses: actions/setup-java@v1 - with: - java-version: 11 - - # Gradle wrapper 파일 실행 권한주기 - - name: Grant execute permission for gradlew - run: chmod +x gradlew - working-directory: ${{ env.working-directory }} - - # Gradle test를 실행한다 - - name: Test with Gradle - run: ./gradlew test - working-directory: ${{ env.working-directory }} - - # 테스트 후 Result를 보기위해 Publish Unit Test Results step 추가 - - name: Publish Unit Test Results - uses: EnricoMi/publish-unit-test-result-action@v1 - if: ${{ always() }} # 테스트가 실패하여도 Report를 보기 위해 `always`로 설정 - with: - files: dogvelopers/build/test-results/**/*.xml # junit report xml 을 가르킴 - - - name: gradle build - run: ./gradlew build - working-directory: ${{ env.working-directory }} - - - name: send to aws - run: scp -i $key ~/Desktop/dogvelopers.jar ubuntu@54.180.208.212:~/daemon - From 143c1f949e0b1380a09fa466e234f3827df94614 Mon Sep 17 00:00:00 2001 From: jaeyeon kim Date: Tue, 15 Mar 2022 20:39:42 +0900 Subject: [PATCH 40/75] #25 github action test --- .gitignore | 5 +- .idea/.gitignore | 3 - .idea/dogVelopers_backend.iml | 9 --- .idea/gradle.xml | 18 ----- .idea/jarRepositories.xml | 20 ------ .idea/misc.xml | 8 --- .idea/modules.xml | 8 --- .idea/uiDesigner.xml | 124 ---------------------------------- .idea/vcs.xml | 6 -- cat | 0 10 files changed, 3 insertions(+), 198 deletions(-) delete mode 100644 .idea/.gitignore delete mode 100644 .idea/dogVelopers_backend.iml delete mode 100644 .idea/gradle.xml delete mode 100644 .idea/jarRepositories.xml delete mode 100644 .idea/misc.xml delete mode 100644 .idea/modules.xml delete mode 100644 .idea/uiDesigner.xml delete mode 100644 .idea/vcs.xml delete mode 100644 cat diff --git a/.gitignore b/.gitignore index e4f7451..d7b64ce 100644 --- a/.gitignore +++ b/.gitignore @@ -35,7 +35,9 @@ build/ !**/src/test/**/build/ .idea/workspace.xml appspec.yml -*.yml +application.yml +application-aws.yml +application-credentials.yml ### STS ### .apt_generated @@ -86,7 +88,6 @@ bin/ out/ !**/src/main/**/out/ !**/src/test/**/out/ -*.yml ### NetBeans ### /nbproject/private/ diff --git a/.idea/.gitignore b/.idea/.gitignore deleted file mode 100644 index 26d3352..0000000 --- a/.idea/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml diff --git a/.idea/dogVelopers_backend.iml b/.idea/dogVelopers_backend.iml deleted file mode 100644 index d6ebd48..0000000 --- a/.idea/dogVelopers_backend.iml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml deleted file mode 100644 index 5e11bc2..0000000 --- a/.idea/gradle.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml deleted file mode 100644 index fdc392f..0000000 --- a/.idea/jarRepositories.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 8999961..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index 30e76a9..0000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml deleted file mode 100644 index e96534f..0000000 --- a/.idea/uiDesigner.xml +++ /dev/null @@ -1,124 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 35eb1dd..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/cat b/cat deleted file mode 100644 index e69de29..0000000 From 568cb63374b6e87ebd5e51495229d16d87d61586 Mon Sep 17 00:00:00 2001 From: jaeyeon kim Date: Tue, 15 Mar 2022 20:43:05 +0900 Subject: [PATCH 41/75] #25 github action test --- .github/workflows/pullRequest.yml | 51 +++++++++++++++++++++++++++++++ .github/workflows/push.yml | 6 ++++ .gitignore | 3 -- 3 files changed, 57 insertions(+), 3 deletions(-) create mode 100644 .github/workflows/pullRequest.yml create mode 100644 .github/workflows/push.yml diff --git a/.github/workflows/pullRequest.yml b/.github/workflows/pullRequest.yml new file mode 100644 index 0000000..ac6391b --- /dev/null +++ b/.github/workflows/pullRequest.yml @@ -0,0 +1,51 @@ +name: Spring build gradle + +on: + push: + branches: + - develop + + pull_request: + branches: + - main # pull request 시에 적용되는 branch 에다가 적용 + +jobs: + build: + runs-on: ubuntu-latest + env: + working-directory: /home/runner/work/dogVelopersServer/dogVelopersServer/dogvelopers + key: ${{ secrets.KEY }} + + steps: + - uses: actions/checkout@v2 + + # 소스코드들은 11을 위주로 짰음 + - name: Set up Jdk 11 + uses: actions/setup-java@v1 + with: + java-version: 11 + + # Gradle wrapper 파일 실행 권한주기 + - name: Grant execute permission for gradlew + run: chmod +x gradlew + working-directory: ${{ env.working-directory }} + + # Gradle test를 실행한다 + - name: Test with Gradle + use: mikepenz/action-junit-report@v2 + run: ./gradlew test + working-directory: ${{ env.working-directory }} + + # 테스트 후 Result를 보기위해 Publish Unit Test Results step 추가 + - name: Publish Unit Test Results + uses: EnricoMi/publish-unit-test-result-action@v1 + if: ${{ always() }} # 테스트가 실패하여도 Report를 보기 위해 `always`로 설정 + with: + files: dogvelopers/build/test-results/**/*.xml # junit report xml 을 가르킴 + + - name: gradle build + run: ./gradlew build + working-directory: ${{ env.working-directory }} + + - name: send to aws + run: scp -i ${{env.key}} ~/Desktop/dogvelopers.jar ubuntu@54.180.208.212:~/daemon diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml new file mode 100644 index 0000000..25bbb99 --- /dev/null +++ b/.github/workflows/push.yml @@ -0,0 +1,6 @@ +name: Spring build gradle + +on: + push: + branches: + - develop # 내가 평소에 PR 하기 전 작업하는 branch 에다가 적용 \ No newline at end of file diff --git a/.gitignore b/.gitignore index d7b64ce..b140f4b 100644 --- a/.gitignore +++ b/.gitignore @@ -104,7 +104,6 @@ out/ /.github/workflows/gradle.yml /.gradle/ /gradle/ -/.github/ /gradle/wrapper/ /.idea/ ### NetBeans ### @@ -122,7 +121,6 @@ out/ /.github/workflows/gradle.yml /.gradle/ /gradle/ -/.github/ /gradle/wrapper/ /.idea/ ### NetBeans ### @@ -140,6 +138,5 @@ out/ /.github/workflows/gradle.yml /.gradle/ /gradle/ -/.github/ /gradle/wrapper/ /.idea/ From 3a890293e7f9bc7546aa9330352b4f6334961fb9 Mon Sep 17 00:00:00 2001 From: jaeyeon kim Date: Tue, 15 Mar 2022 20:44:01 +0900 Subject: [PATCH 42/75] #25 github action test --- .github/workflows/pullRequest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pullRequest.yml b/.github/workflows/pullRequest.yml index ac6391b..f9e3556 100644 --- a/.github/workflows/pullRequest.yml +++ b/.github/workflows/pullRequest.yml @@ -32,7 +32,7 @@ jobs: # Gradle test를 실행한다 - name: Test with Gradle - use: mikepenz/action-junit-report@v2 + uses: mikepenz/action-junit-report@v2 run: ./gradlew test working-directory: ${{ env.working-directory }} From 7cf40b73c36b9a60c022809f2bf508b25f9dc8b5 Mon Sep 17 00:00:00 2001 From: jaeyeon kim Date: Tue, 15 Mar 2022 20:45:03 +0900 Subject: [PATCH 43/75] #25 github action test --- .github/workflows/pullRequest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pullRequest.yml b/.github/workflows/pullRequest.yml index f9e3556..d0ea268 100644 --- a/.github/workflows/pullRequest.yml +++ b/.github/workflows/pullRequest.yml @@ -18,6 +18,7 @@ jobs: steps: - uses: actions/checkout@v2 + - uses: mikepenz/action-junit-report@v2 # 소스코드들은 11을 위주로 짰음 - name: Set up Jdk 11 @@ -32,7 +33,6 @@ jobs: # Gradle test를 실행한다 - name: Test with Gradle - uses: mikepenz/action-junit-report@v2 run: ./gradlew test working-directory: ${{ env.working-directory }} From aaccbe61b51b7501f4177cc3f00a68990b480141 Mon Sep 17 00:00:00 2001 From: jaeyeon kim Date: Tue, 15 Mar 2022 20:45:40 +0900 Subject: [PATCH 44/75] #25 github action test --- .github/workflows/pullRequest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pullRequest.yml b/.github/workflows/pullRequest.yml index d0ea268..1dc4fbb 100644 --- a/.github/workflows/pullRequest.yml +++ b/.github/workflows/pullRequest.yml @@ -18,7 +18,7 @@ jobs: steps: - uses: actions/checkout@v2 - - uses: mikepenz/action-junit-report@v2 +# - uses: mikepenz/action-junit-report@v2 # 소스코드들은 11을 위주로 짰음 - name: Set up Jdk 11 From a96385ce7ab06629988e939c7f65240c4825160c Mon Sep 17 00:00:00 2001 From: jaeyeon kim Date: Tue, 15 Mar 2022 20:49:09 +0900 Subject: [PATCH 45/75] #25 github action test --- .github/workflows/push.yml | 2 +- .../dogvelopers/dogvelopers/controller/HofControllerTest.java | 1 + .../dogvelopers/controller/MemberControllerTest.java | 1 + .../dogvelopers/controller/ProjectControllerTest.java | 1 + 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 25bbb99..2f7c5d2 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -3,4 +3,4 @@ name: Spring build gradle on: push: branches: - - develop # 내가 평소에 PR 하기 전 작업하는 branch 에다가 적용 \ No newline at end of file +# - develop # 내가 평소에 PR 하기 전 작업하는 branch 에다가 적용 \ No newline at end of file diff --git a/dogvelopers/src/test/java/com/dogvelopers/dogvelopers/controller/HofControllerTest.java b/dogvelopers/src/test/java/com/dogvelopers/dogvelopers/controller/HofControllerTest.java index 82e55e6..17c1e98 100644 --- a/dogvelopers/src/test/java/com/dogvelopers/dogvelopers/controller/HofControllerTest.java +++ b/dogvelopers/src/test/java/com/dogvelopers/dogvelopers/controller/HofControllerTest.java @@ -28,6 +28,7 @@ @Transactional public class HofControllerTest { + @Autowired MockMvc mockMvc; @Autowired diff --git a/dogvelopers/src/test/java/com/dogvelopers/dogvelopers/controller/MemberControllerTest.java b/dogvelopers/src/test/java/com/dogvelopers/dogvelopers/controller/MemberControllerTest.java index 5c4afc1..dbb2952 100644 --- a/dogvelopers/src/test/java/com/dogvelopers/dogvelopers/controller/MemberControllerTest.java +++ b/dogvelopers/src/test/java/com/dogvelopers/dogvelopers/controller/MemberControllerTest.java @@ -34,6 +34,7 @@ @SpringBootTest @Transactional public class MemberControllerTest{ + @Autowired MockMvc mockMvc; @Autowired diff --git a/dogvelopers/src/test/java/com/dogvelopers/dogvelopers/controller/ProjectControllerTest.java b/dogvelopers/src/test/java/com/dogvelopers/dogvelopers/controller/ProjectControllerTest.java index fa2fb6a..523af4b 100644 --- a/dogvelopers/src/test/java/com/dogvelopers/dogvelopers/controller/ProjectControllerTest.java +++ b/dogvelopers/src/test/java/com/dogvelopers/dogvelopers/controller/ProjectControllerTest.java @@ -25,6 +25,7 @@ @Transactional public class ProjectControllerTest { + @Autowired MockMvc mockMvc; @Autowired From 468c4404b16bd312047b7eb1c70b0c8026332ab5 Mon Sep 17 00:00:00 2001 From: jaeyeon kim Date: Tue, 15 Mar 2022 20:53:56 +0900 Subject: [PATCH 46/75] #25 github action test --- .gitignore | 2 -- .../src/main/resources/application.yml | 22 +++++++++++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 dogvelopers/src/main/resources/application.yml diff --git a/.gitignore b/.gitignore index b140f4b..02fd1f5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,4 @@ HELP.md -.gradle build/ !gradle/wrapper/gradle-wrapper.jar !**/src/main/**/build/ @@ -35,7 +34,6 @@ build/ !**/src/test/**/build/ .idea/workspace.xml appspec.yml -application.yml application-aws.yml application-credentials.yml diff --git a/dogvelopers/src/main/resources/application.yml b/dogvelopers/src/main/resources/application.yml new file mode 100644 index 0000000..8e02e30 --- /dev/null +++ b/dogvelopers/src/main/resources/application.yml @@ -0,0 +1,22 @@ +spring: + datasource: + driver-class-name: com.mysql.cj.jdbc.Driver + url: jdbc:mysql://localhost:3306/dogveloper?serverTimezone=Asia/Seoul&characterEncoding=UTF-8 + username: dogvelopers + password: dogs0209!! + mvc: + hiddentmethod: + filter: + enable: true + + jpa: + show-sql: true + # hibernate: + # ddl-auto: create + profiles: + include: + - aws + - credentials + +server: + port: 8088 From 474b7ead64b162eb053dd9152d54b2981ba6cd9d Mon Sep 17 00:00:00 2001 From: jaeyeon kim Date: Tue, 15 Mar 2022 23:26:23 +0900 Subject: [PATCH 47/75] #25 github action test --- .github/workflows/pullRequest.yml | 6 ++--- .github/workflows/push.yml | 41 ++++++++++++++++++++++++++++++- 2 files changed, 43 insertions(+), 4 deletions(-) diff --git a/.github/workflows/pullRequest.yml b/.github/workflows/pullRequest.yml index 1dc4fbb..f68dc49 100644 --- a/.github/workflows/pullRequest.yml +++ b/.github/workflows/pullRequest.yml @@ -1,9 +1,9 @@ name: Spring build gradle on: - push: - branches: - - develop +# push: +# branches: +# - develop pull_request: branches: diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 2f7c5d2..a5ff13c 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -3,4 +3,43 @@ name: Spring build gradle on: push: branches: -# - develop # 내가 평소에 PR 하기 전 작업하는 branch 에다가 적용 \ No newline at end of file + - develop # 내가 평소에 PR 하기 전 작업하는 branch 에다가 적용 + +env: + S3_BUCKET_NAME: cafein-deploy # bucket name 변수 생성 + PATH: dogvelopers +jobs: + build: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + + - name: Set up JDK 11 + uses: actions/setup-java@v2 + with: + java-version: '11' + distribution: 'temurin' + + - name: Grant execute permission for gradlew + run: chmod +x gradlew + working-directory: ${{ PATH }} + + - name: Build with Gradle + run: ./gradlew clean build + working-directory: ${{ PATH }} + + - name: Make zip file + run: zip -r ./$GITHUB_SHA.zip . + shell: bash + working-directory: ${{ PATH }} + + - name: Configure AWS credentials + uses: aws-actions/configure-aws-credentials@v1 + with: + aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} + aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} + aws-region: ${{ secrets.AWS_REGION }} + + - name: Upload to S3 + run: aws s3 cp --region ap-northeast-2 ./dogvelopers/$GITHUB_SHA.zip s3://$S3_BUCKET_NAME/$GITHUB_SHA.zip \ No newline at end of file From 6938865ac9484d9b1947cb8160c2f347d6dcb544 Mon Sep 17 00:00:00 2001 From: jaeyeon kim Date: Tue, 15 Mar 2022 23:31:35 +0900 Subject: [PATCH 48/75] #25 github action test --- .github/workflows/pullRequest.yml | 100 +++++++++++++++--------------- .github/workflows/push.yml | 10 +-- 2 files changed, 55 insertions(+), 55 deletions(-) diff --git a/.github/workflows/pullRequest.yml b/.github/workflows/pullRequest.yml index f68dc49..de60ed3 100644 --- a/.github/workflows/pullRequest.yml +++ b/.github/workflows/pullRequest.yml @@ -1,51 +1,51 @@ -name: Spring build gradle - -on: -# push: +#name: Spring build gradle +# +#on: +## push: +## branches: +## - develop +# +# pull_request: # branches: -# - develop - - pull_request: - branches: - - main # pull request 시에 적용되는 branch 에다가 적용 - -jobs: - build: - runs-on: ubuntu-latest - env: - working-directory: /home/runner/work/dogVelopersServer/dogVelopersServer/dogvelopers - key: ${{ secrets.KEY }} - - steps: - - uses: actions/checkout@v2 -# - uses: mikepenz/action-junit-report@v2 - - # 소스코드들은 11을 위주로 짰음 - - name: Set up Jdk 11 - uses: actions/setup-java@v1 - with: - java-version: 11 - - # Gradle wrapper 파일 실행 권한주기 - - name: Grant execute permission for gradlew - run: chmod +x gradlew - working-directory: ${{ env.working-directory }} - - # Gradle test를 실행한다 - - name: Test with Gradle - run: ./gradlew test - working-directory: ${{ env.working-directory }} - - # 테스트 후 Result를 보기위해 Publish Unit Test Results step 추가 - - name: Publish Unit Test Results - uses: EnricoMi/publish-unit-test-result-action@v1 - if: ${{ always() }} # 테스트가 실패하여도 Report를 보기 위해 `always`로 설정 - with: - files: dogvelopers/build/test-results/**/*.xml # junit report xml 을 가르킴 - - - name: gradle build - run: ./gradlew build - working-directory: ${{ env.working-directory }} - - - name: send to aws - run: scp -i ${{env.key}} ~/Desktop/dogvelopers.jar ubuntu@54.180.208.212:~/daemon +# - main # pull request 시에 적용되는 branch 에다가 적용 +# +#jobs: +# build: +# runs-on: ubuntu-latest +# env: +# working-directory: /home/runner/work/dogVelopersServer/dogVelopersServer/dogvelopers +# key: ${{ secrets.KEY }} +# +# steps: +# - uses: actions/checkout@v2 +## - uses: mikepenz/action-junit-report@v2 +# +# # 소스코드들은 11을 위주로 짰음 +# - name: Set up Jdk 11 +# uses: actions/setup-java@v1 +# with: +# java-version: 11 +# +# # Gradle wrapper 파일 실행 권한주기 +# - name: Grant execute permission for gradlew +# run: chmod +x gradlew +# working-directory: ${{ env.working-directory }} +# +# # Gradle test를 실행한다 +# - name: Test with Gradle +# run: ./gradlew test +# working-directory: ${{ env.working-directory }} +# +# # 테스트 후 Result를 보기위해 Publish Unit Test Results step 추가 +# - name: Publish Unit Test Results +# uses: EnricoMi/publish-unit-test-result-action@v1 +# if: ${{ always() }} # 테스트가 실패하여도 Report를 보기 위해 `always`로 설정 +# with: +# files: dogvelopers/build/test-results/**/*.xml # junit report xml 을 가르킴 +# +# - name: gradle build +# run: ./gradlew build +# working-directory: ${{ env.working-directory }} +# +# - name: send to aws +# run: scp -i ${{env.key}} ~/Desktop/dogvelopers.jar ubuntu@54.180.208.212:~/daemon diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index a5ff13c..ade45fc 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -6,8 +6,9 @@ on: - develop # 내가 평소에 PR 하기 전 작업하는 branch 에다가 적용 env: - S3_BUCKET_NAME: cafein-deploy # bucket name 변수 생성 + S3_BUCKET_NAME: dogveloper-build # bucket name 변수 생성 PATH: dogvelopers + jobs: build: runs-on: ubuntu-latest @@ -19,20 +20,19 @@ jobs: uses: actions/setup-java@v2 with: java-version: '11' - distribution: 'temurin' - name: Grant execute permission for gradlew run: chmod +x gradlew - working-directory: ${{ PATH }} + working-directory: ${{ env.PATH }} - name: Build with Gradle run: ./gradlew clean build - working-directory: ${{ PATH }} + working-directory: ${{ env.PATH }} - name: Make zip file run: zip -r ./$GITHUB_SHA.zip . shell: bash - working-directory: ${{ PATH }} + working-directory: ${{ env.PATH }} - name: Configure AWS credentials uses: aws-actions/configure-aws-credentials@v1 From 994d1bc137aee03a8310eac0e85b80193050d10d Mon Sep 17 00:00:00 2001 From: jaeyeon kim Date: Tue, 15 Mar 2022 23:34:16 +0900 Subject: [PATCH 49/75] #25 github action test --- .github/workflows/pullRequest.yml | 100 +++++++++++++++--------------- 1 file changed, 50 insertions(+), 50 deletions(-) diff --git a/.github/workflows/pullRequest.yml b/.github/workflows/pullRequest.yml index de60ed3..f68dc49 100644 --- a/.github/workflows/pullRequest.yml +++ b/.github/workflows/pullRequest.yml @@ -1,51 +1,51 @@ -#name: Spring build gradle -# -#on: -## push: -## branches: -## - develop -# -# pull_request: +name: Spring build gradle + +on: +# push: # branches: -# - main # pull request 시에 적용되는 branch 에다가 적용 -# -#jobs: -# build: -# runs-on: ubuntu-latest -# env: -# working-directory: /home/runner/work/dogVelopersServer/dogVelopersServer/dogvelopers -# key: ${{ secrets.KEY }} -# -# steps: -# - uses: actions/checkout@v2 -## - uses: mikepenz/action-junit-report@v2 -# -# # 소스코드들은 11을 위주로 짰음 -# - name: Set up Jdk 11 -# uses: actions/setup-java@v1 -# with: -# java-version: 11 -# -# # Gradle wrapper 파일 실행 권한주기 -# - name: Grant execute permission for gradlew -# run: chmod +x gradlew -# working-directory: ${{ env.working-directory }} -# -# # Gradle test를 실행한다 -# - name: Test with Gradle -# run: ./gradlew test -# working-directory: ${{ env.working-directory }} -# -# # 테스트 후 Result를 보기위해 Publish Unit Test Results step 추가 -# - name: Publish Unit Test Results -# uses: EnricoMi/publish-unit-test-result-action@v1 -# if: ${{ always() }} # 테스트가 실패하여도 Report를 보기 위해 `always`로 설정 -# with: -# files: dogvelopers/build/test-results/**/*.xml # junit report xml 을 가르킴 -# -# - name: gradle build -# run: ./gradlew build -# working-directory: ${{ env.working-directory }} -# -# - name: send to aws -# run: scp -i ${{env.key}} ~/Desktop/dogvelopers.jar ubuntu@54.180.208.212:~/daemon +# - develop + + pull_request: + branches: + - main # pull request 시에 적용되는 branch 에다가 적용 + +jobs: + build: + runs-on: ubuntu-latest + env: + working-directory: /home/runner/work/dogVelopersServer/dogVelopersServer/dogvelopers + key: ${{ secrets.KEY }} + + steps: + - uses: actions/checkout@v2 +# - uses: mikepenz/action-junit-report@v2 + + # 소스코드들은 11을 위주로 짰음 + - name: Set up Jdk 11 + uses: actions/setup-java@v1 + with: + java-version: 11 + + # Gradle wrapper 파일 실행 권한주기 + - name: Grant execute permission for gradlew + run: chmod +x gradlew + working-directory: ${{ env.working-directory }} + + # Gradle test를 실행한다 + - name: Test with Gradle + run: ./gradlew test + working-directory: ${{ env.working-directory }} + + # 테스트 후 Result를 보기위해 Publish Unit Test Results step 추가 + - name: Publish Unit Test Results + uses: EnricoMi/publish-unit-test-result-action@v1 + if: ${{ always() }} # 테스트가 실패하여도 Report를 보기 위해 `always`로 설정 + with: + files: dogvelopers/build/test-results/**/*.xml # junit report xml 을 가르킴 + + - name: gradle build + run: ./gradlew build + working-directory: ${{ env.working-directory }} + + - name: send to aws + run: scp -i ${{env.key}} ~/Desktop/dogvelopers.jar ubuntu@54.180.208.212:~/daemon From 8cc56bc17f767d6d29aa60ad001e21232a9510dc Mon Sep 17 00:00:00 2001 From: jaeyeon kim Date: Tue, 15 Mar 2022 23:38:58 +0900 Subject: [PATCH 50/75] #25 github action test --- .github/workflows/pullRequest.yml | 100 +++++++++++++++--------------- 1 file changed, 50 insertions(+), 50 deletions(-) diff --git a/.github/workflows/pullRequest.yml b/.github/workflows/pullRequest.yml index f68dc49..de60ed3 100644 --- a/.github/workflows/pullRequest.yml +++ b/.github/workflows/pullRequest.yml @@ -1,51 +1,51 @@ -name: Spring build gradle - -on: -# push: +#name: Spring build gradle +# +#on: +## push: +## branches: +## - develop +# +# pull_request: # branches: -# - develop - - pull_request: - branches: - - main # pull request 시에 적용되는 branch 에다가 적용 - -jobs: - build: - runs-on: ubuntu-latest - env: - working-directory: /home/runner/work/dogVelopersServer/dogVelopersServer/dogvelopers - key: ${{ secrets.KEY }} - - steps: - - uses: actions/checkout@v2 -# - uses: mikepenz/action-junit-report@v2 - - # 소스코드들은 11을 위주로 짰음 - - name: Set up Jdk 11 - uses: actions/setup-java@v1 - with: - java-version: 11 - - # Gradle wrapper 파일 실행 권한주기 - - name: Grant execute permission for gradlew - run: chmod +x gradlew - working-directory: ${{ env.working-directory }} - - # Gradle test를 실행한다 - - name: Test with Gradle - run: ./gradlew test - working-directory: ${{ env.working-directory }} - - # 테스트 후 Result를 보기위해 Publish Unit Test Results step 추가 - - name: Publish Unit Test Results - uses: EnricoMi/publish-unit-test-result-action@v1 - if: ${{ always() }} # 테스트가 실패하여도 Report를 보기 위해 `always`로 설정 - with: - files: dogvelopers/build/test-results/**/*.xml # junit report xml 을 가르킴 - - - name: gradle build - run: ./gradlew build - working-directory: ${{ env.working-directory }} - - - name: send to aws - run: scp -i ${{env.key}} ~/Desktop/dogvelopers.jar ubuntu@54.180.208.212:~/daemon +# - main # pull request 시에 적용되는 branch 에다가 적용 +# +#jobs: +# build: +# runs-on: ubuntu-latest +# env: +# working-directory: /home/runner/work/dogVelopersServer/dogVelopersServer/dogvelopers +# key: ${{ secrets.KEY }} +# +# steps: +# - uses: actions/checkout@v2 +## - uses: mikepenz/action-junit-report@v2 +# +# # 소스코드들은 11을 위주로 짰음 +# - name: Set up Jdk 11 +# uses: actions/setup-java@v1 +# with: +# java-version: 11 +# +# # Gradle wrapper 파일 실행 권한주기 +# - name: Grant execute permission for gradlew +# run: chmod +x gradlew +# working-directory: ${{ env.working-directory }} +# +# # Gradle test를 실행한다 +# - name: Test with Gradle +# run: ./gradlew test +# working-directory: ${{ env.working-directory }} +# +# # 테스트 후 Result를 보기위해 Publish Unit Test Results step 추가 +# - name: Publish Unit Test Results +# uses: EnricoMi/publish-unit-test-result-action@v1 +# if: ${{ always() }} # 테스트가 실패하여도 Report를 보기 위해 `always`로 설정 +# with: +# files: dogvelopers/build/test-results/**/*.xml # junit report xml 을 가르킴 +# +# - name: gradle build +# run: ./gradlew build +# working-directory: ${{ env.working-directory }} +# +# - name: send to aws +# run: scp -i ${{env.key}} ~/Desktop/dogvelopers.jar ubuntu@54.180.208.212:~/daemon From c4a45f7190b8933fcfd66b427afc50a60b739288 Mon Sep 17 00:00:00 2001 From: jaeyeon kim Date: Tue, 15 Mar 2022 23:42:01 +0900 Subject: [PATCH 51/75] #25 github action test --- .github/workflows/push.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index ade45fc..1a345bd 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -7,7 +7,7 @@ on: env: S3_BUCKET_NAME: dogveloper-build # bucket name 변수 생성 - PATH: dogvelopers + PATH: ./dogvelopers jobs: build: @@ -17,7 +17,7 @@ jobs: - uses: actions/checkout@v2 - name: Set up JDK 11 - uses: actions/setup-java@v2 + uses: actions/setup-java@v1 with: java-version: '11' From edf95058c50729dc8c61644c91d858c00b8d7e57 Mon Sep 17 00:00:00 2001 From: jaeyeon kim Date: Tue, 15 Mar 2022 23:44:06 +0900 Subject: [PATCH 52/75] #25 github action test --- .github/workflows/pullRequest.yml | 100 +++++++++++++++--------------- .github/workflows/push.yml | 90 +++++++++++++-------------- 2 files changed, 95 insertions(+), 95 deletions(-) diff --git a/.github/workflows/pullRequest.yml b/.github/workflows/pullRequest.yml index de60ed3..f68dc49 100644 --- a/.github/workflows/pullRequest.yml +++ b/.github/workflows/pullRequest.yml @@ -1,51 +1,51 @@ -#name: Spring build gradle -# -#on: -## push: -## branches: -## - develop -# -# pull_request: +name: Spring build gradle + +on: +# push: # branches: -# - main # pull request 시에 적용되는 branch 에다가 적용 -# -#jobs: -# build: -# runs-on: ubuntu-latest -# env: -# working-directory: /home/runner/work/dogVelopersServer/dogVelopersServer/dogvelopers -# key: ${{ secrets.KEY }} -# -# steps: -# - uses: actions/checkout@v2 -## - uses: mikepenz/action-junit-report@v2 -# -# # 소스코드들은 11을 위주로 짰음 -# - name: Set up Jdk 11 -# uses: actions/setup-java@v1 -# with: -# java-version: 11 -# -# # Gradle wrapper 파일 실행 권한주기 -# - name: Grant execute permission for gradlew -# run: chmod +x gradlew -# working-directory: ${{ env.working-directory }} -# -# # Gradle test를 실행한다 -# - name: Test with Gradle -# run: ./gradlew test -# working-directory: ${{ env.working-directory }} -# -# # 테스트 후 Result를 보기위해 Publish Unit Test Results step 추가 -# - name: Publish Unit Test Results -# uses: EnricoMi/publish-unit-test-result-action@v1 -# if: ${{ always() }} # 테스트가 실패하여도 Report를 보기 위해 `always`로 설정 -# with: -# files: dogvelopers/build/test-results/**/*.xml # junit report xml 을 가르킴 -# -# - name: gradle build -# run: ./gradlew build -# working-directory: ${{ env.working-directory }} -# -# - name: send to aws -# run: scp -i ${{env.key}} ~/Desktop/dogvelopers.jar ubuntu@54.180.208.212:~/daemon +# - develop + + pull_request: + branches: + - main # pull request 시에 적용되는 branch 에다가 적용 + +jobs: + build: + runs-on: ubuntu-latest + env: + working-directory: /home/runner/work/dogVelopersServer/dogVelopersServer/dogvelopers + key: ${{ secrets.KEY }} + + steps: + - uses: actions/checkout@v2 +# - uses: mikepenz/action-junit-report@v2 + + # 소스코드들은 11을 위주로 짰음 + - name: Set up Jdk 11 + uses: actions/setup-java@v1 + with: + java-version: 11 + + # Gradle wrapper 파일 실행 권한주기 + - name: Grant execute permission for gradlew + run: chmod +x gradlew + working-directory: ${{ env.working-directory }} + + # Gradle test를 실행한다 + - name: Test with Gradle + run: ./gradlew test + working-directory: ${{ env.working-directory }} + + # 테스트 후 Result를 보기위해 Publish Unit Test Results step 추가 + - name: Publish Unit Test Results + uses: EnricoMi/publish-unit-test-result-action@v1 + if: ${{ always() }} # 테스트가 실패하여도 Report를 보기 위해 `always`로 설정 + with: + files: dogvelopers/build/test-results/**/*.xml # junit report xml 을 가르킴 + + - name: gradle build + run: ./gradlew build + working-directory: ${{ env.working-directory }} + + - name: send to aws + run: scp -i ${{env.key}} ~/Desktop/dogvelopers.jar ubuntu@54.180.208.212:~/daemon diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 1a345bd..cd356c8 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -1,45 +1,45 @@ -name: Spring build gradle - -on: - push: - branches: - - develop # 내가 평소에 PR 하기 전 작업하는 branch 에다가 적용 - -env: - S3_BUCKET_NAME: dogveloper-build # bucket name 변수 생성 - PATH: ./dogvelopers - -jobs: - build: - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v2 - - - name: Set up JDK 11 - uses: actions/setup-java@v1 - with: - java-version: '11' - - - name: Grant execute permission for gradlew - run: chmod +x gradlew - working-directory: ${{ env.PATH }} - - - name: Build with Gradle - run: ./gradlew clean build - working-directory: ${{ env.PATH }} - - - name: Make zip file - run: zip -r ./$GITHUB_SHA.zip . - shell: bash - working-directory: ${{ env.PATH }} - - - name: Configure AWS credentials - uses: aws-actions/configure-aws-credentials@v1 - with: - aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} - aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} - aws-region: ${{ secrets.AWS_REGION }} - - - name: Upload to S3 - run: aws s3 cp --region ap-northeast-2 ./dogvelopers/$GITHUB_SHA.zip s3://$S3_BUCKET_NAME/$GITHUB_SHA.zip \ No newline at end of file +#name: Spring build gradle +# +#on: +# push: +# branches: +# - develop # 내가 평소에 PR 하기 전 작업하는 branch 에다가 적용 +# +#env: +# S3_BUCKET_NAME: dogveloper-build # bucket name 변수 생성 +# PATH: ./dogvelopers +# +#jobs: +# build: +# runs-on: ubuntu-latest +# +# steps: +# - uses: actions/checkout@v2 +# +# - name: Set up JDK 11 +# uses: actions/setup-java@v1 +# with: +# java-version: '11' +# +# - name: Grant execute permission for gradlew +# run: chmod +x gradlew +# working-directory: ${{ env.PATH }} +# +# - name: Build with Gradle +# run: ./gradlew clean build +# working-directory: ${{ env.PATH }} +# +# - name: Make zip file +# run: zip -r ./$GITHUB_SHA.zip . +# shell: bash +# working-directory: ${{ env.PATH }} +# +# - name: Configure AWS credentials +# uses: aws-actions/configure-aws-credentials@v1 +# with: +# aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} +# aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} +# aws-region: ${{ secrets.AWS_REGION }} +# +# - name: Upload to S3 +# run: aws s3 cp --region ap-northeast-2 ./dogvelopers/$GITHUB_SHA.zip s3://$S3_BUCKET_NAME/$GITHUB_SHA.zip \ No newline at end of file From db03b46ea80682e4fff1007b9f9f182144309937 Mon Sep 17 00:00:00 2001 From: jaeyeon kim Date: Tue, 15 Mar 2022 23:44:32 +0900 Subject: [PATCH 53/75] #25 github action test --- .github/workflows/pullRequest.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pullRequest.yml b/.github/workflows/pullRequest.yml index f68dc49..1dc4fbb 100644 --- a/.github/workflows/pullRequest.yml +++ b/.github/workflows/pullRequest.yml @@ -1,9 +1,9 @@ name: Spring build gradle on: -# push: -# branches: -# - develop + push: + branches: + - develop pull_request: branches: From f9f990360613472cf08339bddb2cd2ce1d028565 Mon Sep 17 00:00:00 2001 From: jaeyeon kim Date: Tue, 15 Mar 2022 23:46:42 +0900 Subject: [PATCH 54/75] #25 github action test --- .github/workflows/pullRequest.yml | 102 +++++++++++++++--------------- .github/workflows/push.yml | 90 +++++++++++++------------- 2 files changed, 96 insertions(+), 96 deletions(-) diff --git a/.github/workflows/pullRequest.yml b/.github/workflows/pullRequest.yml index 1dc4fbb..b175437 100644 --- a/.github/workflows/pullRequest.yml +++ b/.github/workflows/pullRequest.yml @@ -1,51 +1,51 @@ -name: Spring build gradle - -on: - push: - branches: - - develop - - pull_request: - branches: - - main # pull request 시에 적용되는 branch 에다가 적용 - -jobs: - build: - runs-on: ubuntu-latest - env: - working-directory: /home/runner/work/dogVelopersServer/dogVelopersServer/dogvelopers - key: ${{ secrets.KEY }} - - steps: - - uses: actions/checkout@v2 -# - uses: mikepenz/action-junit-report@v2 - - # 소스코드들은 11을 위주로 짰음 - - name: Set up Jdk 11 - uses: actions/setup-java@v1 - with: - java-version: 11 - - # Gradle wrapper 파일 실행 권한주기 - - name: Grant execute permission for gradlew - run: chmod +x gradlew - working-directory: ${{ env.working-directory }} - - # Gradle test를 실행한다 - - name: Test with Gradle - run: ./gradlew test - working-directory: ${{ env.working-directory }} - - # 테스트 후 Result를 보기위해 Publish Unit Test Results step 추가 - - name: Publish Unit Test Results - uses: EnricoMi/publish-unit-test-result-action@v1 - if: ${{ always() }} # 테스트가 실패하여도 Report를 보기 위해 `always`로 설정 - with: - files: dogvelopers/build/test-results/**/*.xml # junit report xml 을 가르킴 - - - name: gradle build - run: ./gradlew build - working-directory: ${{ env.working-directory }} - - - name: send to aws - run: scp -i ${{env.key}} ~/Desktop/dogvelopers.jar ubuntu@54.180.208.212:~/daemon +#name: Spring build gradle +# +#on: +# push: +# branches: +# - develop +# +# pull_request: +# branches: +# - main # pull request 시에 적용되는 branch 에다가 적용 +# +#jobs: +# build: +# runs-on: ubuntu-latest +# env: +# working-directory: /home/runner/work/dogVelopersServer/dogVelopersServer/dogvelopers +# key: ${{ secrets.KEY }} +# +# steps: +# - uses: actions/checkout@v2 +## - uses: mikepenz/action-junit-report@v2 +# +# # 소스코드들은 11을 위주로 짰음 +# - name: Set up Jdk 11 +# uses: actions/setup-java@v1 +# with: +# java-version: 11 +# +# # Gradle wrapper 파일 실행 권한주기 +# - name: Grant execute permission for gradlew +# run: chmod +x gradlew +# working-directory: ${{ env.working-directory }} +# +# # Gradle test를 실행한다 +# - name: Test with Gradle +# run: ./gradlew test +# working-directory: ${{ env.working-directory }} +# +# # 테스트 후 Result를 보기위해 Publish Unit Test Results step 추가 +# - name: Publish Unit Test Results +# uses: EnricoMi/publish-unit-test-result-action@v1 +# if: ${{ always() }} # 테스트가 실패하여도 Report를 보기 위해 `always`로 설정 +# with: +# files: dogvelopers/build/test-results/**/*.xml # junit report xml 을 가르킴 +# +# - name: gradle build +# run: ./gradlew build +# working-directory: ${{ env.working-directory }} +# +# - name: send to aws +# run: scp -i ${{env.key}} ~/Desktop/dogvelopers.jar ubuntu@54.180.208.212:~/daemon diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index cd356c8..ac51722 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -1,45 +1,45 @@ -#name: Spring build gradle -# -#on: -# push: -# branches: -# - develop # 내가 평소에 PR 하기 전 작업하는 branch 에다가 적용 -# -#env: -# S3_BUCKET_NAME: dogveloper-build # bucket name 변수 생성 -# PATH: ./dogvelopers -# -#jobs: -# build: -# runs-on: ubuntu-latest -# -# steps: -# - uses: actions/checkout@v2 -# -# - name: Set up JDK 11 -# uses: actions/setup-java@v1 -# with: -# java-version: '11' -# -# - name: Grant execute permission for gradlew -# run: chmod +x gradlew -# working-directory: ${{ env.PATH }} -# -# - name: Build with Gradle -# run: ./gradlew clean build -# working-directory: ${{ env.PATH }} -# -# - name: Make zip file -# run: zip -r ./$GITHUB_SHA.zip . -# shell: bash -# working-directory: ${{ env.PATH }} -# -# - name: Configure AWS credentials -# uses: aws-actions/configure-aws-credentials@v1 -# with: -# aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} -# aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} -# aws-region: ${{ secrets.AWS_REGION }} -# -# - name: Upload to S3 -# run: aws s3 cp --region ap-northeast-2 ./dogvelopers/$GITHUB_SHA.zip s3://$S3_BUCKET_NAME/$GITHUB_SHA.zip \ No newline at end of file +name: Spring build gradle + +on: + push: + branches: + - develop # 내가 평소에 PR 하기 전 작업하는 branch 에다가 적용 + + +jobs: + build: + runs-on: ubuntu-latest + env: + S3_BUCKET_NAME: dogveloper-build # bucket name 변수 생성 + PATH: ./dogvelopers + + steps: + - uses: actions/checkout@v2 + + - name: Set up JDK 11 + uses: actions/setup-java@v1 + with: + java-version: '11' + + - name: Grant execute permission for gradlew + run: chmod +x gradlew + working-directory: ${{ env.PATH }} + + - name: Build with Gradle + run: ./gradlew clean build + working-directory: ${{ env.PATH }} + + - name: Make zip file + run: zip -r ./$GITHUB_SHA.zip . + shell: bash + working-directory: ${{ env.PATH }} + + - name: Configure AWS credentials + uses: aws-actions/configure-aws-credentials@v1 + with: + aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} + aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} + aws-region: ${{ secrets.AWS_REGION }} + + - name: Upload to S3 + run: aws s3 cp --region ap-northeast-2 ./dogvelopers/$GITHUB_SHA.zip s3://$S3_BUCKET_NAME/$GITHUB_SHA.zip \ No newline at end of file From 341bd654712677c458c9a145994f78df9381fa9f Mon Sep 17 00:00:00 2001 From: jaeyeon kim Date: Tue, 15 Mar 2022 23:47:52 +0900 Subject: [PATCH 55/75] #25 github action test --- .github/workflows/push.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index ac51722..f9fcad9 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -20,6 +20,7 @@ jobs: uses: actions/setup-java@v1 with: java-version: '11' +# env - name: Grant execute permission for gradlew run: chmod +x gradlew From d71e43c4b7f731367ca9fa63936ec23d65a6fc03 Mon Sep 17 00:00:00 2001 From: jaeyeon kim Date: Tue, 15 Mar 2022 23:49:06 +0900 Subject: [PATCH 56/75] #25 github action test --- .github/workflows/push.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index f9fcad9..1b0900b 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -9,9 +9,9 @@ on: jobs: build: runs-on: ubuntu-latest - env: - S3_BUCKET_NAME: dogveloper-build # bucket name 변수 생성 - PATH: ./dogvelopers +# env: +# S3_BUCKET_NAME: dogveloper-build # bucket name 변수 생성 +# PATH: ./dogvelopers steps: - uses: actions/checkout@v2 From edef9289e341a4d8ef6e0559996eede206a17952 Mon Sep 17 00:00:00 2001 From: jaeyeon kim Date: Tue, 15 Mar 2022 23:49:53 +0900 Subject: [PATCH 57/75] #25 --- .github/workflows/push.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 1b0900b..fe0056a 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -9,9 +9,9 @@ on: jobs: build: runs-on: ubuntu-latest -# env: + env: # S3_BUCKET_NAME: dogveloper-build # bucket name 변수 생성 -# PATH: ./dogvelopers + PATH: ./dogvelopers steps: - uses: actions/checkout@v2 From 3394f056d125efdc53c44a8a1c61953291d51b43 Mon Sep 17 00:00:00 2001 From: jaeyeon kim Date: Tue, 15 Mar 2022 23:51:19 +0900 Subject: [PATCH 58/75] #25 --- .github/workflows/push.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index fe0056a..59d320c 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -10,8 +10,8 @@ jobs: build: runs-on: ubuntu-latest env: -# S3_BUCKET_NAME: dogveloper-build # bucket name 변수 생성 - PATH: ./dogvelopers + S3_BUCKET_NAME: dogveloper-build # bucket name 변수 생성 + working-directory: /home/runner/work/dogVelopersServer/dogVelopersServer/dogvelopers steps: - uses: actions/checkout@v2 From e2111fd0b9dff14e5c957daaa26f832685c6dbda Mon Sep 17 00:00:00 2001 From: jaeyeon kim Date: Tue, 15 Mar 2022 23:52:26 +0900 Subject: [PATCH 59/75] #25 --- .github/workflows/push.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 59d320c..75d01b1 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -24,16 +24,16 @@ jobs: - name: Grant execute permission for gradlew run: chmod +x gradlew - working-directory: ${{ env.PATH }} + working-directory: ${{ env.working-directory }} - name: Build with Gradle run: ./gradlew clean build - working-directory: ${{ env.PATH }} + working-directory: ${{ env.working-directoryy }} - name: Make zip file run: zip -r ./$GITHUB_SHA.zip . shell: bash - working-directory: ${{ env.PATH }} + working-directory: ${{ env.working-directory }} - name: Configure AWS credentials uses: aws-actions/configure-aws-credentials@v1 From d439b0c94c873c8ceda0a79557baa320ba1afd1a Mon Sep 17 00:00:00 2001 From: jaeyeon kim Date: Tue, 15 Mar 2022 23:54:26 +0900 Subject: [PATCH 60/75] #25g= --- .github/workflows/push.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 75d01b1..0118d16 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -10,7 +10,8 @@ jobs: build: runs-on: ubuntu-latest env: - S3_BUCKET_NAME: dogveloper-build # bucket name 변수 생성 + S3_BUCKET_NAME: dogveloper-build + # bucket name 변수 생성 working-directory: /home/runner/work/dogVelopersServer/dogVelopersServer/dogvelopers steps: @@ -28,7 +29,7 @@ jobs: - name: Build with Gradle run: ./gradlew clean build - working-directory: ${{ env.working-directoryy }} + working-directory: ${{ env.working-directory }} - name: Make zip file run: zip -r ./$GITHUB_SHA.zip . From c77f85bec3ba48efdff287aa289c3fb5ad03055f Mon Sep 17 00:00:00 2001 From: jaeyeon kim Date: Tue, 15 Mar 2022 23:56:44 +0900 Subject: [PATCH 61/75] #25 --- dogvelopers/build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dogvelopers/build.gradle b/dogvelopers/build.gradle index 379de0a..396594a 100644 --- a/dogvelopers/build.gradle +++ b/dogvelopers/build.gradle @@ -52,6 +52,6 @@ bootJar{ archiveVersion = "0.0.1" } -test { - useJUnitPlatform() // 이 의존성이 있어야지 , github action 시에 test 돌릴 수 있음 -} \ No newline at end of file +//test { +// useJUnitPlatform() // 이 의존성이 있어야지 , github action 시에 test 돌릴 수 있음 +//} \ No newline at end of file From 8be8d21bfd368c7c865283802ab97b58dbd1d8d1 Mon Sep 17 00:00:00 2001 From: jaeyeon kim Date: Wed, 16 Mar 2022 12:06:10 +0900 Subject: [PATCH 62/75] #25 --- .github/workflows/.idea/.gitignore | 0 .github/workflows/.idea/misc.xml | 6 + .github/workflows/.idea/modules.xml | 8 + .github/workflows/.idea/runConfigurations.xml | 10 ++ .github/workflows/.idea/workflows.iml | 9 ++ .github/workflows/.idea/workspace.xml | 30 ++++ .gitignore | 138 ------------------ .idea/.gitignore | 3 + .idea/compiler.xml | 14 ++ .idea/dogVelopers_backend.iml | 9 ++ .idea/gradle.xml | 18 +++ .idea/jarRepositories.xml | 20 +++ .idea/misc.xml | 8 + .idea/modules.xml | 8 + .idea/runConfigurations.xml | 10 ++ .idea/uiDesigner.xml | 124 ++++++++++++++++ .idea/vcs.xml | 6 + 17 files changed, 283 insertions(+), 138 deletions(-) create mode 100644 .github/workflows/.idea/.gitignore create mode 100644 .github/workflows/.idea/misc.xml create mode 100644 .github/workflows/.idea/modules.xml create mode 100644 .github/workflows/.idea/runConfigurations.xml create mode 100644 .github/workflows/.idea/workflows.iml create mode 100644 .github/workflows/.idea/workspace.xml create mode 100644 .idea/.gitignore create mode 100644 .idea/compiler.xml create mode 100644 .idea/dogVelopers_backend.iml create mode 100644 .idea/gradle.xml create mode 100644 .idea/jarRepositories.xml create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/runConfigurations.xml create mode 100644 .idea/uiDesigner.xml create mode 100644 .idea/vcs.xml diff --git a/.github/workflows/.idea/.gitignore b/.github/workflows/.idea/.gitignore new file mode 100644 index 0000000..e69de29 diff --git a/.github/workflows/.idea/misc.xml b/.github/workflows/.idea/misc.xml new file mode 100644 index 0000000..639900d --- /dev/null +++ b/.github/workflows/.idea/misc.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.github/workflows/.idea/modules.xml b/.github/workflows/.idea/modules.xml new file mode 100644 index 0000000..82a2bec --- /dev/null +++ b/.github/workflows/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.github/workflows/.idea/runConfigurations.xml b/.github/workflows/.idea/runConfigurations.xml new file mode 100644 index 0000000..797acea --- /dev/null +++ b/.github/workflows/.idea/runConfigurations.xml @@ -0,0 +1,10 @@ + + + + + + \ No newline at end of file diff --git a/.github/workflows/.idea/workflows.iml b/.github/workflows/.idea/workflows.iml new file mode 100644 index 0000000..d6ebd48 --- /dev/null +++ b/.github/workflows/.idea/workflows.iml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.github/workflows/.idea/workspace.xml b/.github/workflows/.idea/workspace.xml new file mode 100644 index 0000000..cc32951 --- /dev/null +++ b/.github/workflows/.idea/workspace.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + 1647325463128 + + + + \ No newline at end of file diff --git a/.gitignore b/.gitignore index 02fd1f5..8f2c065 100644 --- a/.gitignore +++ b/.gitignore @@ -1,140 +1,2 @@ -HELP.md -build/ -!gradle/wrapper/gradle-wrapper.jar -!**/src/main/**/build/ -!**/src/test/**/build/ -.idea/workspace.xml -appspec.yml - -### STS ### -.apt_generated -.classpath -.factorypath -.project -.settings -.springBeans -.sts4-cache -bin/ -!**/src/main/**/bin/ -!**/src/test/**/bin/ - -### IntelliJ IDEA ### -.idea -*.iws -*.iml -*.ipr -out/ -!**/src/main/**/out/ -!**/src/test/**/out/ -HELP.md -.gradle -build/ -!gradle/wrapper/gradle-wrapper.jar -!**/src/main/**/build/ -!**/src/test/**/build/ -.idea/workspace.xml -appspec.yml application-aws.yml application-credentials.yml - -### STS ### -.apt_generated -.classpath -.factorypath -.project -.settings -.springBeans -.sts4-cache -bin/ -!**/src/main/**/bin/ -!**/src/test/**/bin/ - -### IntelliJ IDEA ### -.idea -*.iws -*.iml -*.ipr -out/ -!**/src/main/**/out/ -!**/src/test/**/out/ -HELP.md -.gradle -build/ -!gradle/wrapper/gradle-wrapper.jar -!**/src/main/**/build/ -!**/src/test/**/build/ -.idea/workspace.xml -appspec.yml - -### STS ### -.apt_generated -.classpath -.factorypath -.project -.settings -.springBeans -.sts4-cache -bin/ -!**/src/main/**/bin/ -!**/src/test/**/bin/ - -### IntelliJ IDEA ### -.idea -*.iws -*.iml -*.ipr -out/ -!**/src/main/**/out/ -!**/src/test/**/out/ - -### NetBeans ### -/nbproject/private/ -/nbbuild/ -/dist/ -/nbdist/ -/.nb-gradle/ - -### VS Code ### -.vscode/ -/src/main/resources/application.yml -/src/main/resources/application-aws.yml -/src/main/resources/application-credentials.yml -/.github/workflows/gradle.yml -/.gradle/ -/gradle/ -/gradle/wrapper/ -/.idea/ -### NetBeans ### -/nbproject/private/ -/nbbuild/ -/dist/ -/nbdist/ -/.nb-gradle/ - -### VS Code ### -.vscode/ -/src/main/resources/application.yml -/src/main/resources/application-aws.yml -/src/main/resources/application-credentials.yml -/.github/workflows/gradle.yml -/.gradle/ -/gradle/ -/gradle/wrapper/ -/.idea/ -### NetBeans ### -/nbproject/private/ -/nbbuild/ -/dist/ -/nbdist/ -/.nb-gradle/ - -### VS Code ### -.vscode/ -/src/main/resources/application.yml -/src/main/resources/application-aws.yml -/src/main/resources/application-credentials.yml -/.github/workflows/gradle.yml -/.gradle/ -/gradle/ -/gradle/wrapper/ -/.idea/ diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..26d3352 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..0a2846f --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/dogVelopers_backend.iml b/.idea/dogVelopers_backend.iml new file mode 100644 index 0000000..d6ebd48 --- /dev/null +++ b/.idea/dogVelopers_backend.iml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000..5e11bc2 --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,18 @@ + + + + + + + \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml new file mode 100644 index 0000000..fdc392f --- /dev/null +++ b/.idea/jarRepositories.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..8999961 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..30e76a9 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml new file mode 100644 index 0000000..797acea --- /dev/null +++ b/.idea/runConfigurations.xml @@ -0,0 +1,10 @@ + + + + + + \ No newline at end of file diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml new file mode 100644 index 0000000..e96534f --- /dev/null +++ b/.idea/uiDesigner.xml @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file From c4f71ffa3ec6d7e6b6de7fc963c2a00056a2673e Mon Sep 17 00:00:00 2001 From: jaeyeon kim Date: Wed, 16 Mar 2022 12:14:23 +0900 Subject: [PATCH 63/75] #25 --- .github/workflows/push.yml | 6 +++++- dogvelopers/build.gradle | 6 +++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 0118d16..e1a36ca 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -21,12 +21,16 @@ jobs: uses: actions/setup-java@v1 with: java-version: '11' -# env - name: Grant execute permission for gradlew run: chmod +x gradlew working-directory: ${{ env.working-directory }} + # Gradle test를 실행한다 + - name: Test with Gradle + run: ./gradlew test + working-directory: ${{ env.working-directory }} + - name: Build with Gradle run: ./gradlew clean build working-directory: ${{ env.working-directory }} diff --git a/dogvelopers/build.gradle b/dogvelopers/build.gradle index 396594a..379de0a 100644 --- a/dogvelopers/build.gradle +++ b/dogvelopers/build.gradle @@ -52,6 +52,6 @@ bootJar{ archiveVersion = "0.0.1" } -//test { -// useJUnitPlatform() // 이 의존성이 있어야지 , github action 시에 test 돌릴 수 있음 -//} \ No newline at end of file +test { + useJUnitPlatform() // 이 의존성이 있어야지 , github action 시에 test 돌릴 수 있음 +} \ No newline at end of file From d85fbb125c1823e40705a1efe7b64a4cb9da3d86 Mon Sep 17 00:00:00 2001 From: jaeyeon kim Date: Wed, 16 Mar 2022 13:29:45 +0900 Subject: [PATCH 64/75] #25 --- .github/workflows/push.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index e1a36ca..da8cea7 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -26,6 +26,11 @@ jobs: run: chmod +x gradlew working-directory: ${{ env.working-directory }} + - name: Set S3 + run : | + echo("${{secrets.APPLICATION_AWS}}") >> ./dogvelopers/src/main/resources/application-credentials.yml + echo("${{secrets.APPLICATION_CREDTIALS}}") >> ./dogvelopers/src/main/resources/application-credentials.yml + # Gradle test를 실행한다 - name: Test with Gradle run: ./gradlew test From 35f1f02616580afab60e6d98b321425bbd806ca5 Mon Sep 17 00:00:00 2001 From: jaeyeon kim Date: Wed, 16 Mar 2022 13:32:56 +0900 Subject: [PATCH 65/75] #25 --- .github/workflows/push.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index da8cea7..beca9fc 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -28,8 +28,8 @@ jobs: - name: Set S3 run : | - echo("${{secrets.APPLICATION_AWS}}") >> ./dogvelopers/src/main/resources/application-credentials.yml - echo("${{secrets.APPLICATION_CREDTIALS}}") >> ./dogvelopers/src/main/resources/application-credentials.yml + echo ${{secrets.APPLICATION_AWS}} >> ./dogvelopers/src/main/resources/application-credentials.yml + echo ${{secrets.APPLICATION_CREDTIALS}} >> ./dogvelopers/src/main/resources/application-credentials.yml # Gradle test를 실행한다 - name: Test with Gradle From 59086528588426878e59ce02f9905462ac8fae90 Mon Sep 17 00:00:00 2001 From: jaeyeon kim Date: Wed, 16 Mar 2022 13:34:03 +0900 Subject: [PATCH 66/75] #25 --- .github/workflows/push.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index beca9fc..bfdf1b7 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -28,8 +28,8 @@ jobs: - name: Set S3 run : | - echo ${{secrets.APPLICATION_AWS}} >> ./dogvelopers/src/main/resources/application-credentials.yml - echo ${{secrets.APPLICATION_CREDTIALS}} >> ./dogvelopers/src/main/resources/application-credentials.yml + echo "${{secrets.APPLICATION_AWS}}" >> ./dogvelopers/src/main/resources/application-credentials.yml + echo "${{secrets.APPLICATION_CREDTIALS}}" >> ./dogvelopers/src/main/resources/application-credentials.yml # Gradle test를 실행한다 - name: Test with Gradle From c164d29048ce870b599a4c91d80f8a9b2f2602ae Mon Sep 17 00:00:00 2001 From: jaeyeon kim Date: Wed, 16 Mar 2022 13:42:19 +0900 Subject: [PATCH 67/75] #25 --- .github/workflows/push.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index bfdf1b7..a23639a 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -27,10 +27,13 @@ jobs: working-directory: ${{ env.working-directory }} - name: Set S3 - run : | - echo "${{secrets.APPLICATION_AWS}}" >> ./dogvelopers/src/main/resources/application-credentials.yml + run: | + echo "${{secrets.APPLICATION_AWS}}" >> ./dogvelopers/src/main/resources/application-aws.yml echo "${{secrets.APPLICATION_CREDTIALS}}" >> ./dogvelopers/src/main/resources/application-credentials.yml + - name: Read yml + run: cat ./dogvelopers/src/main/resources/application-aws.yml + # Gradle test를 실행한다 - name: Test with Gradle run: ./gradlew test From cd48d7f310f514fafa425e5c3e4dd85ac66297db Mon Sep 17 00:00:00 2001 From: jaeyeon kim Date: Wed, 16 Mar 2022 13:49:53 +0900 Subject: [PATCH 68/75] #25 --- .github/workflows/push.yml | 6 ++++-- dogvelopers/src/main/resources/application.yml | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index a23639a..430f37d 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -31,8 +31,10 @@ jobs: echo "${{secrets.APPLICATION_AWS}}" >> ./dogvelopers/src/main/resources/application-aws.yml echo "${{secrets.APPLICATION_CREDTIALS}}" >> ./dogvelopers/src/main/resources/application-credentials.yml - - name: Read yml - run: cat ./dogvelopers/src/main/resources/application-aws.yml + - name: install MySql + run: apt-get install mysql-server + + - name: # Gradle test를 실행한다 - name: Test with Gradle diff --git a/dogvelopers/src/main/resources/application.yml b/dogvelopers/src/main/resources/application.yml index 8e02e30..9304c95 100644 --- a/dogvelopers/src/main/resources/application.yml +++ b/dogvelopers/src/main/resources/application.yml @@ -11,8 +11,8 @@ spring: jpa: show-sql: true - # hibernate: - # ddl-auto: create + hibernate: + ddl-auto: create profiles: include: - aws From a9382a29acb1a814729ce36e661abf306498f05d Mon Sep 17 00:00:00 2001 From: jaeyeon kim Date: Wed, 16 Mar 2022 13:50:58 +0900 Subject: [PATCH 69/75] #25 --- .github/workflows/push.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 430f37d..449aa9a 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -31,10 +31,8 @@ jobs: echo "${{secrets.APPLICATION_AWS}}" >> ./dogvelopers/src/main/resources/application-aws.yml echo "${{secrets.APPLICATION_CREDTIALS}}" >> ./dogvelopers/src/main/resources/application-credentials.yml - - name: install MySql - run: apt-get install mysql-server - - - name: +# - name: install MySql +# run: apt-get install mysql-server # Gradle test를 실행한다 - name: Test with Gradle From 436a096e6e382a1d2c2733d63c2669bd1aaddc06 Mon Sep 17 00:00:00 2001 From: jaeyeon kim Date: Wed, 16 Mar 2022 18:01:31 +0900 Subject: [PATCH 70/75] #25 --- dogvelopers/src/main/resources/application.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dogvelopers/src/main/resources/application.yml b/dogvelopers/src/main/resources/application.yml index 9304c95..8d039b5 100644 --- a/dogvelopers/src/main/resources/application.yml +++ b/dogvelopers/src/main/resources/application.yml @@ -10,8 +10,8 @@ spring: enable: true jpa: - show-sql: true - hibernate: + hibernate: + show-sql: true ddl-auto: create profiles: include: From 2b54dca2d6b368ba4916a7df331bbf60786cbffb Mon Sep 17 00:00:00 2001 From: jaeyeon kim Date: Wed, 16 Mar 2022 18:04:11 +0900 Subject: [PATCH 71/75] #25 --- dogvelopers/src/main/resources/application.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dogvelopers/src/main/resources/application.yml b/dogvelopers/src/main/resources/application.yml index 8d039b5..9601079 100644 --- a/dogvelopers/src/main/resources/application.yml +++ b/dogvelopers/src/main/resources/application.yml @@ -11,8 +11,10 @@ spring: jpa: hibernate: - show-sql: true - ddl-auto: create + ddl-auto: create + properties: + hibernate: + show-sql: true profiles: include: - aws From b4f8040b95d7e01d9542b11ab33c50a2d64e3f7c Mon Sep 17 00:00:00 2001 From: jaeyeon kim Date: Thu, 17 Mar 2022 00:10:19 +0900 Subject: [PATCH 72/75] #25 --- .github/workflows/push.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 449aa9a..373dbc5 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -9,6 +9,16 @@ on: jobs: build: runs-on: ubuntu-latest + services: # 서비스할 목록들 (ex. Redis, Postgresql ...) + mysql: # 사용할 서비스 명 + image: mysql:5.7 # 사용할 서비스의 이미지(도커 개념 기반) + env: # 사용할 서비스의 환경설정 + MYSQL_USER: dogvelopers + MYSQL_PASSWORD: dogs0209!! + MYSQL_ROOT_PASSWORD: root + MYSQL_DATABASE: PLAM + ports: # 열어줄 포트, 8080:3306 형태로도 가능 + - 3306 env: S3_BUCKET_NAME: dogveloper-build # bucket name 변수 생성 @@ -31,6 +41,10 @@ jobs: echo "${{secrets.APPLICATION_AWS}}" >> ./dogvelopers/src/main/resources/application-aws.yml echo "${{secrets.APPLICATION_CREDTIALS}}" >> ./dogvelopers/src/main/resources/application-credentials.yml + - name: Set databases + run: | + mysql -u root -p + source /home/runner/work/dogVelopersServer/dogVelopersServer/dogveloper.sql # - name: install MySql # run: apt-get install mysql-server From 91134add0675c1a18148d5150f7d8d1c52943b3c Mon Sep 17 00:00:00 2001 From: jaeyeon kim Date: Thu, 17 Mar 2022 00:13:53 +0900 Subject: [PATCH 73/75] #25 --- .github/workflows/push.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 373dbc5..79fd51c 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest services: # 서비스할 목록들 (ex. Redis, Postgresql ...) mysql: # 사용할 서비스 명 - image: mysql:5.7 # 사용할 서비스의 이미지(도커 개념 기반) + image: mysql:5.7 env: # 사용할 서비스의 환경설정 MYSQL_USER: dogvelopers MYSQL_PASSWORD: dogs0209!! From 10707db1badb3b41a696c818af7fe5f8070d245d Mon Sep 17 00:00:00 2001 From: jaeyeon kim Date: Thu, 17 Mar 2022 00:15:48 +0900 Subject: [PATCH 74/75] #25 --- .github/workflows/push.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 79fd51c..77d4f90 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -9,16 +9,16 @@ on: jobs: build: runs-on: ubuntu-latest - services: # 서비스할 목록들 (ex. Redis, Postgresql ...) - mysql: # 사용할 서비스 명 - image: mysql:5.7 - env: # 사용할 서비스의 환경설정 - MYSQL_USER: dogvelopers - MYSQL_PASSWORD: dogs0209!! - MYSQL_ROOT_PASSWORD: root - MYSQL_DATABASE: PLAM - ports: # 열어줄 포트, 8080:3306 형태로도 가능 - - 3306 +# services: # 서비스할 목록들 (ex. Redis, Postgresql ...) +# mysql: # 사용할 서비스 명 +# image: mysql:5.7 +# env: # 사용할 서비스의 환경설정 +# MYSQL_USER: dogvelopers +# MYSQL_PASSWORD: dogs0209!! +# MYSQL_ROOT_PASSWORD: root +# MYSQL_DATABASE: PLAM +# ports: # 열어줄 포트, 8080:3306 형태로도 가능 +# - 3306 env: S3_BUCKET_NAME: dogveloper-build # bucket name 변수 생성 From 5ab71ee539405d5e2e6c5e16f75f83860d294e2c Mon Sep 17 00:00:00 2001 From: jaeyeon kim Date: Thu, 17 Mar 2022 12:10:33 +0900 Subject: [PATCH 75/75] #25 --- .github/workflows/push.yml | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 77d4f90..0dced04 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -9,16 +9,16 @@ on: jobs: build: runs-on: ubuntu-latest -# services: # 서비스할 목록들 (ex. Redis, Postgresql ...) -# mysql: # 사용할 서비스 명 -# image: mysql:5.7 -# env: # 사용할 서비스의 환경설정 -# MYSQL_USER: dogvelopers -# MYSQL_PASSWORD: dogs0209!! -# MYSQL_ROOT_PASSWORD: root -# MYSQL_DATABASE: PLAM -# ports: # 열어줄 포트, 8080:3306 형태로도 가능 -# - 3306 + services: # 서비스할 목록들 (ex. Redis, Postgresql ...) + mysql: # 사용할 서비스 명 + image: mysql:5.7 + env: # 사용할 서비스의 환경설정 + MYSQL_USER: dogvelopers + MYSQL_PASSWORD: dogs0209!! + MYSQL_ROOT_PASSWORD: root + MYSQL_DATABASE: PLAM + ports: # 열어줄 포트, 8080:3306 형태로도 가능 + - 3306 env: S3_BUCKET_NAME: dogveloper-build # bucket name 변수 생성 @@ -43,7 +43,8 @@ jobs: - name: Set databases run: | - mysql -u root -p + mysql -u root -p \n + ${{ env.MYSQL_PASSWORD }} \n source /home/runner/work/dogVelopersServer/dogVelopersServer/dogveloper.sql # - name: install MySql # run: apt-get install mysql-server