From d866f48fae5fa2631127914fb1cf8c00fb89947d Mon Sep 17 00:00:00 2001 From: songhyeonpk Date: Sat, 8 Mar 2025 14:02:43 +0900 Subject: [PATCH 1/5] =?UTF-8?q?chore:=20develop=20pull=20request,=20develo?= =?UTF-8?q?p=20build=20deploy=20=EC=9B=8C=ED=81=AC=ED=94=8C=EB=A1=9C=20?= =?UTF-8?q?=ED=99=98=EA=B2=BD=20=EB=B3=80=EC=88=98=20=EC=84=A4=EC=A0=95=20?= =?UTF-8?q?=EC=8A=A4=ED=85=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/develop_build_deploy.yml | 13 +++++++++---- .github/workflows/develop_pull_request.yml | 13 +++++++++---- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/.github/workflows/develop_build_deploy.yml b/.github/workflows/develop_build_deploy.yml index 73077c5..06cfc2f 100644 --- a/.github/workflows/develop_build_deploy.yml +++ b/.github/workflows/develop_build_deploy.yml @@ -18,10 +18,6 @@ jobs: - name: Checkout uses: actions/checkout@v4 - # ENV 로드, Github ENV 등록 - - name: Load ENV into Environment Variable - run: echo "${{ secrets.ENV }}" >> $GITHUB_ENV - # JDK 17 세팅 - name: Set up JDK 17 uses: actions/setup-java@v4 @@ -33,6 +29,15 @@ jobs: - name: Grant Execute Permission for Gradlew run: chmod +x ./gradlew + # ENV 설정 + - name: Load ENV into Environment Variable + run: | + echo "${{ secrets.ENV }}" >> $GITHUB_ENV + + while IFS= read -r line; do + echo "::add-mask::$line" + done <<< "${{ secrets.ENV }}" + # Gradle 빌드 - name: Build with Gradle id: gradle diff --git a/.github/workflows/develop_pull_request.yml b/.github/workflows/develop_pull_request.yml index 577d77d..6938254 100644 --- a/.github/workflows/develop_pull_request.yml +++ b/.github/workflows/develop_pull_request.yml @@ -13,10 +13,6 @@ jobs: - name: Checkout uses: actions/checkout@v4 - # ENV 설정 - - name: Load ENV into Environment Variable - run: echo "${{ secrets.ENV }}" >> $GITHUB_ENV - # JDK 17 세팅 - name: Set up JDK 17 uses: actions/setup-java@v4 @@ -28,6 +24,15 @@ jobs: - name: Grant Execute Permission for Gradlew run: chmod +x ./gradlew + # ENV 설정 + - name: Load ENV into Environment Variable + run: | + echo "${{ secrets.ENV }}" >> $GITHUB_ENV + + while IFS= read -r line; do + echo "::add-mask::$line" + done <<< "${{ secrets.ENV }}" + # Gradle setup, check(코드 품질 관리, 테스트) 실행 - name: Setup Gradle uses: gradle/gradle-build-action@v2 From 1ea3cc2e699787169058585daf6446c1806690e0 Mon Sep 17 00:00:00 2001 From: songhyeonpk Date: Sat, 8 Mar 2025 14:16:12 +0900 Subject: [PATCH 2/5] =?UTF-8?q?chore:=20=EB=A1=9C=EA=B7=B8=EC=97=90=20?= =?UTF-8?q?=EC=B6=9C=EB=A0=A5=EB=90=98=EB=8A=94=20=ED=99=98=EA=B2=BD?= =?UTF-8?q?=EB=B3=80=EC=88=98=EB=A5=BC=20=EB=A7=88=EC=8A=A4=ED=82=B9?= =?UTF-8?q?=ED=95=98=EB=8A=94=20=EC=8A=A4=ED=85=9D=20=EB=B6=84=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/develop_build_deploy.yml | 3 +++ .github/workflows/develop_pull_request.yml | 3 +++ 2 files changed, 6 insertions(+) diff --git a/.github/workflows/develop_build_deploy.yml b/.github/workflows/develop_build_deploy.yml index 06cfc2f..f141b27 100644 --- a/.github/workflows/develop_build_deploy.yml +++ b/.github/workflows/develop_build_deploy.yml @@ -34,6 +34,9 @@ jobs: run: | echo "${{ secrets.ENV }}" >> $GITHUB_ENV + # ENV 로그 마스킹 적용 + - name: Mask ENV + run: | while IFS= read -r line; do echo "::add-mask::$line" done <<< "${{ secrets.ENV }}" diff --git a/.github/workflows/develop_pull_request.yml b/.github/workflows/develop_pull_request.yml index 6938254..23ee9e3 100644 --- a/.github/workflows/develop_pull_request.yml +++ b/.github/workflows/develop_pull_request.yml @@ -29,6 +29,9 @@ jobs: run: | echo "${{ secrets.ENV }}" >> $GITHUB_ENV + # ENV 로그 마스킹 적용 + - name: Mask ENV + run: | while IFS= read -r line; do echo "::add-mask::$line" done <<< "${{ secrets.ENV }}" From d6441fbda6be8021ad130457427ceb3aa670a8fa Mon Sep 17 00:00:00 2001 From: songhyeonpk Date: Sat, 8 Mar 2025 14:35:42 +0900 Subject: [PATCH 3/5] =?UTF-8?q?chore:=20=EC=9B=8C=ED=81=AC=ED=94=8C?= =?UTF-8?q?=EB=A1=9C=20=EC=8B=A4=ED=96=89=ED=99=98=EA=B2=BD=EC=97=90=20?= =?UTF-8?q?=EB=93=B1=EB=A1=9D=EB=90=9C=20=ED=99=98=EA=B2=BD=EB=B3=80?= =?UTF-8?q?=EC=88=98=EB=A5=BC=20=EB=A7=88=EC=8A=A4=ED=82=B9=ED=95=98?= =?UTF-8?q?=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/develop_build_deploy.yml | 8 +++++--- .github/workflows/develop_pull_request.yml | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.github/workflows/develop_build_deploy.yml b/.github/workflows/develop_build_deploy.yml index f141b27..09b821f 100644 --- a/.github/workflows/develop_build_deploy.yml +++ b/.github/workflows/develop_build_deploy.yml @@ -37,9 +37,11 @@ jobs: # ENV 로그 마스킹 적용 - name: Mask ENV run: | - while IFS= read -r line; do - echo "::add-mask::$line" - done <<< "${{ secrets.ENV }}" + if [ -f "$GITHUB_ENV" ]; then + while IFS= read -r line; do + echo "::add-mask::$line" + done < "$GITHUB_ENV" + fi # Gradle 빌드 - name: Build with Gradle diff --git a/.github/workflows/develop_pull_request.yml b/.github/workflows/develop_pull_request.yml index 23ee9e3..c27b1ed 100644 --- a/.github/workflows/develop_pull_request.yml +++ b/.github/workflows/develop_pull_request.yml @@ -32,9 +32,11 @@ jobs: # ENV 로그 마스킹 적용 - name: Mask ENV run: | - while IFS= read -r line; do - echo "::add-mask::$line" - done <<< "${{ secrets.ENV }}" + if [ -f "$GITHUB_ENV" ]; then + while IFS= read -r line; do + echo "::add-mask::$line" + done < "$GITHUB_ENV" + fi # Gradle setup, check(코드 품질 관리, 테스트) 실행 - name: Setup Gradle From 29616b3c7c5227d75a48b3434f0c75279dc4377c Mon Sep 17 00:00:00 2001 From: songhyeonpk Date: Sun, 9 Mar 2025 16:31:36 +0900 Subject: [PATCH 4/5] =?UTF-8?q?chore:=20=EC=9B=8C=ED=81=AC=ED=94=8C?= =?UTF-8?q?=EB=A1=9C=20=ED=99=98=EA=B2=BD=EB=B3=80=EC=88=98=EB=A5=BC=20?= =?UTF-8?q?=ED=8C=8C=EC=9D=BC=EB=A1=9C=20=EA=B4=80=EB=A6=AC=ED=95=B4=20exp?= =?UTF-8?q?ort=20=ED=95=98=EB=8A=94=20=EB=B0=A9=EB=B2=95=EC=9C=BC=EB=A1=9C?= =?UTF-8?q?=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/develop_build_deploy.yml | 18 ++++++++---------- .github/workflows/develop_pull_request.yml | 18 ++++++++---------- 2 files changed, 16 insertions(+), 20 deletions(-) diff --git a/.github/workflows/develop_build_deploy.yml b/.github/workflows/develop_build_deploy.yml index 09b821f..f6b826b 100644 --- a/.github/workflows/develop_build_deploy.yml +++ b/.github/workflows/develop_build_deploy.yml @@ -29,19 +29,17 @@ jobs: - name: Grant Execute Permission for Gradlew run: chmod +x ./gradlew - # ENV 설정 - - name: Load ENV into Environment Variable + # .env 파일 생성 + - name: Create .env file run: | - echo "${{ secrets.ENV }}" >> $GITHUB_ENV + echo "${{ secrets.ENV }}" >> .env - # ENV 로그 마스킹 적용 - - name: Mask ENV + # .env 파일을 로드하고 환경변수로 등록 + - name: Load .env and Export Environment Variable run: | - if [ -f "$GITHUB_ENV" ]; then - while IFS= read -r line; do - echo "::add-mask::$line" - done < "$GITHUB_ENV" - fi + set -o allexport + source .env + set +o allexport # Gradle 빌드 - name: Build with Gradle diff --git a/.github/workflows/develop_pull_request.yml b/.github/workflows/develop_pull_request.yml index c27b1ed..9e751d9 100644 --- a/.github/workflows/develop_pull_request.yml +++ b/.github/workflows/develop_pull_request.yml @@ -24,19 +24,17 @@ jobs: - name: Grant Execute Permission for Gradlew run: chmod +x ./gradlew - # ENV 설정 - - name: Load ENV into Environment Variable + # .env 파일 생성 + - name: Create .env file run: | - echo "${{ secrets.ENV }}" >> $GITHUB_ENV + echo "${{ secrets.ENV }}" >> .env - # ENV 로그 마스킹 적용 - - name: Mask ENV + # .env 파일을 로드하고 환경변수로 등록 + - name: Load .env and Export Environment Variable run: | - if [ -f "$GITHUB_ENV" ]; then - while IFS= read -r line; do - echo "::add-mask::$line" - done < "$GITHUB_ENV" - fi + set -o allexport + source .env + set +o allexport # Gradle setup, check(코드 품질 관리, 테스트) 실행 - name: Setup Gradle From 9b59859b3223554f4af2de21840b8966df36e52d Mon Sep 17 00:00:00 2001 From: songhyeonpk Date: Sun, 9 Mar 2025 17:09:46 +0900 Subject: [PATCH 5/5] =?UTF-8?q?chore:=20=EC=9B=8C=ED=81=AC=ED=94=8C?= =?UTF-8?q?=EB=A1=9C=EC=97=90=EC=84=9C=20=ED=99=98=EA=B2=BD=EB=B3=80?= =?UTF-8?q?=EC=88=98=EB=A5=BC.env=20=ED=8C=8C=EC=9D=BC=EB=A1=9C=20?= =?UTF-8?q?=EA=B4=80=EB=A6=AC=ED=95=98=EA=B3=A0=20=ED=85=8C=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8=20=EC=8B=9C=20.env=20=ED=8C=8C=EC=9D=BC=EC=9D=84=20?= =?UTF-8?q?=EC=9D=BD=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/develop_build_deploy.yml | 11 ++--------- .github/workflows/develop_pull_request.yml | 11 ++--------- .../java/com/ftm/server/ServerApplicationTests.java | 2 ++ 3 files changed, 6 insertions(+), 18 deletions(-) diff --git a/.github/workflows/develop_build_deploy.yml b/.github/workflows/develop_build_deploy.yml index f6b826b..2806e0d 100644 --- a/.github/workflows/develop_build_deploy.yml +++ b/.github/workflows/develop_build_deploy.yml @@ -25,22 +25,15 @@ jobs: java-version: '17' distribution: 'temurin' - # Gradlew 생행 권한 허용 + # Gradlew 실행 권한 허용 - name: Grant Execute Permission for Gradlew run: chmod +x ./gradlew # .env 파일 생성 - - name: Create .env file + - name: Load secrets into .env file run: | echo "${{ secrets.ENV }}" >> .env - # .env 파일을 로드하고 환경변수로 등록 - - name: Load .env and Export Environment Variable - run: | - set -o allexport - source .env - set +o allexport - # Gradle 빌드 - name: Build with Gradle id: gradle diff --git a/.github/workflows/develop_pull_request.yml b/.github/workflows/develop_pull_request.yml index 9e751d9..3085223 100644 --- a/.github/workflows/develop_pull_request.yml +++ b/.github/workflows/develop_pull_request.yml @@ -20,21 +20,14 @@ jobs: java-version: '17' distribution: 'temurin' - # Gradlew 생행 권한 허용 + # Gradlew 실행 권한 허용 - name: Grant Execute Permission for Gradlew run: chmod +x ./gradlew # .env 파일 생성 - - name: Create .env file + - name: Load secrets into .env file run: | echo "${{ secrets.ENV }}" >> .env - - # .env 파일을 로드하고 환경변수로 등록 - - name: Load .env and Export Environment Variable - run: | - set -o allexport - source .env - set +o allexport # Gradle setup, check(코드 품질 관리, 테스트) 실행 - name: Setup Gradle diff --git a/src/test/java/com/ftm/server/ServerApplicationTests.java b/src/test/java/com/ftm/server/ServerApplicationTests.java index 9634091..5b67a07 100644 --- a/src/test/java/com/ftm/server/ServerApplicationTests.java +++ b/src/test/java/com/ftm/server/ServerApplicationTests.java @@ -2,8 +2,10 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.TestPropertySource; @SpringBootTest +@TestPropertySource(locations = "file:.env") class ServerApplicationTests { @Test