From 6e4f4597e78c88c51c311d505ed90821cfe2800b Mon Sep 17 00:00:00 2001 From: yunjeongLim <630yjl@gmail.com> Date: Mon, 16 Dec 2024 00:06:54 +0900 Subject: [PATCH 01/19] =?UTF-8?q?Test:=20=EA=B9=83=ED=97=88=EB=B8=8C=20?= =?UTF-8?q?=EC=95=A1=EC=85=98=20=EB=B0=B0=ED=8F=AC=20=ED=85=8C=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/deploy.yml | 67 ++++++++++++++++++++++++++++++++++++ app/(routes)/page.tsx | 2 +- build.sh | 10 ++++++ 3 files changed, 78 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/deploy.yml create mode 100644 build.sh diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml new file mode 100644 index 0000000..6a7589d --- /dev/null +++ b/.github/workflows/deploy.yml @@ -0,0 +1,67 @@ +name: Deploy + + + +on: + + push: + + branches: ['main'] + + + +jobs: + + build: + + runs-on: ubuntu-latest + + container: pandoc/latex + + steps: + + - uses: actions/checkout@v2 + + + + - name: Install mustache (to update the date) + + run: apk add ruby && gem install mustache + + + + - name: creates output + + run: sh ./build.sh + + + + - name: Pushes to another repository + + id: push_directory + + uses: cpina/github-action-push-to-another-repository@main + + env: + + API_TOKEN_GITHUB: ${{ secrets.AUTO_ACTIONS }} + + with: + + source-directory: 'output' + + destination-github-username: 630yjl + + destination-repository-name: ko-chock-chok-web + + user-email: ${{ secrets.EMAIL }} + + commit-message: ${{ github.event.commits[0].message }} + + target-branch: main + + + + - name: Test get variable exported by push-to-another-repository + + run: echo $DESTINATION_CLONED_DIRECTORY \ No newline at end of file diff --git a/app/(routes)/page.tsx b/app/(routes)/page.tsx index de5c838..1963946 100644 --- a/app/(routes)/page.tsx +++ b/app/(routes)/page.tsx @@ -2,7 +2,7 @@ export default function Home() { return (
- 코촉촉 메인페이지 + 코촉촉 메인페이지(수정1)
); } diff --git a/build.sh b/build.sh new file mode 100644 index 0000000..e514196 --- /dev/null +++ b/build.sh @@ -0,0 +1,10 @@ + +#!/bin/sh + +cd ../ + +mkdir output + +cp -R ./web/* ./output + +cp -R ./output ./web/ \ No newline at end of file From 774f3da5874f7a0036a91dc02b23dad73d522464 Mon Sep 17 00:00:00 2001 From: yunjeongLim <630yjl@gmail.com> Date: Mon, 16 Dec 2024 00:13:21 +0900 Subject: [PATCH 02/19] =?UTF-8?q?Test:=20=EA=B9=83=ED=97=88=EB=B8=8C=20?= =?UTF-8?q?=EC=95=A1=EC=85=98=20=EB=B0=B0=ED=8F=AC=20=ED=85=8C=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/(routes)/page.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/(routes)/page.tsx b/app/(routes)/page.tsx index 1963946..18d7323 100644 --- a/app/(routes)/page.tsx +++ b/app/(routes)/page.tsx @@ -2,7 +2,7 @@ export default function Home() { return (
- 코촉촉 메인페이지(수정1) + 코촉촉 메인페이지(수정2)
); } From 598fe001656f9e025e744753711e5e676ec19fc8 Mon Sep 17 00:00:00 2001 From: yunjeongLim <630yjl@gmail.com> Date: Mon, 16 Dec 2024 00:23:49 +0900 Subject: [PATCH 03/19] =?UTF-8?q?Test:=20=EA=B9=83=ED=97=88=EB=B8=8C=20?= =?UTF-8?q?=EC=95=A1=EC=85=98=20=EB=B0=B0=ED=8F=AC=20=ED=85=8C=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/deploy.yml | 2 +- app/(routes)/page.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 6a7589d..9591fde 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -52,7 +52,7 @@ jobs: destination-github-username: 630yjl - destination-repository-name: ko-chock-chok-web + destination-repository-name: ko-chock-chock-web user-email: ${{ secrets.EMAIL }} diff --git a/app/(routes)/page.tsx b/app/(routes)/page.tsx index 18d7323..d67788f 100644 --- a/app/(routes)/page.tsx +++ b/app/(routes)/page.tsx @@ -2,7 +2,7 @@ export default function Home() { return (
- 코촉촉 메인페이지(수정2) + 코촉촉 메인페이지(수정333)
); } From 9d036a4fa0f7fac897a1ecb6cea705216cd98b7d Mon Sep 17 00:00:00 2001 From: yunjeongLim <630yjl@gmail.com> Date: Mon, 16 Dec 2024 00:28:59 +0900 Subject: [PATCH 04/19] =?UTF-8?q?Test:=20=EA=B9=83=ED=97=88=EB=B8=8C=20?= =?UTF-8?q?=EC=95=A1=EC=85=98=20=EB=B0=B0=ED=8F=AC=20=ED=85=8C=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/(routes)/page.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/(routes)/page.tsx b/app/(routes)/page.tsx index d67788f..f9b62e5 100644 --- a/app/(routes)/page.tsx +++ b/app/(routes)/page.tsx @@ -2,7 +2,7 @@ export default function Home() { return (
- 코촉촉 메인페이지(수정333) + 코촉촉 메인페이지(수정444)
); } From 440d147e010c6ac8e8a9a13d142703c5e73e9ae6 Mon Sep 17 00:00:00 2001 From: yunjeongLim <630yjl@gmail.com> Date: Mon, 16 Dec 2024 00:39:00 +0900 Subject: [PATCH 05/19] =?UTF-8?q?Test:=20=EA=B9=83=ED=97=88=EB=B8=8C=20?= =?UTF-8?q?=EC=95=A1=EC=85=98=20=EB=B0=B0=ED=8F=AC=20=ED=85=8C=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/(routes)/page.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/(routes)/page.tsx b/app/(routes)/page.tsx index f9b62e5..c80a394 100644 --- a/app/(routes)/page.tsx +++ b/app/(routes)/page.tsx @@ -2,7 +2,7 @@ export default function Home() { return (
- 코촉촉 메인페이지(수정444) + 코촉촉 메인페이지(수정555)
); } From 11197dad3744ffb61b349481f601d64452fbcae0 Mon Sep 17 00:00:00 2001 From: yunjeongLim <630yjl@gmail.com> Date: Mon, 16 Dec 2024 00:48:39 +0900 Subject: [PATCH 06/19] =?UTF-8?q?Test:=20=EA=B9=83=ED=97=88=EB=B8=8C=20?= =?UTF-8?q?=EC=95=A1=EC=85=98=20=EB=B0=B0=ED=8F=AC=20=ED=85=8C=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/(routes)/page.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/(routes)/page.tsx b/app/(routes)/page.tsx index c80a394..4dc1480 100644 --- a/app/(routes)/page.tsx +++ b/app/(routes)/page.tsx @@ -2,7 +2,7 @@ export default function Home() { return (
- 코촉촉 메인페이지(수정555) + 코촉촉 메인페이지(수정666)
); } From a14b7a9eb8661de705bf0b335a5d24a0b80bbc1e Mon Sep 17 00:00:00 2001 From: yunjeongLim <630yjl@gmail.com> Date: Mon, 16 Dec 2024 00:52:51 +0900 Subject: [PATCH 07/19] =?UTF-8?q?Test:=20=EA=B9=83=ED=97=88=EB=B8=8C=20?= =?UTF-8?q?=EC=95=A1=EC=85=98=20=EB=B0=B0=ED=8F=AC=20=ED=85=8C=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/(routes)/page.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/(routes)/page.tsx b/app/(routes)/page.tsx index 4dc1480..87ebff9 100644 --- a/app/(routes)/page.tsx +++ b/app/(routes)/page.tsx @@ -2,7 +2,7 @@ export default function Home() { return (
- 코촉촉 메인페이지(수정666) + 코촉촉 메인페이지(수정77)
); } From 75c59f25ff8852ac4d0ab68ea8622405bbcb9f22 Mon Sep 17 00:00:00 2001 From: yunjeongLim <630yjl@gmail.com> Date: Mon, 16 Dec 2024 00:58:27 +0900 Subject: [PATCH 08/19] =?UTF-8?q?Test:=20=EA=B9=83=ED=97=88=EB=B8=8C=20?= =?UTF-8?q?=EC=95=A1=EC=85=98=20=EB=B0=B0=ED=8F=AC=20=ED=85=8C=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/(routes)/page.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/(routes)/page.tsx b/app/(routes)/page.tsx index 87ebff9..aa72e5a 100644 --- a/app/(routes)/page.tsx +++ b/app/(routes)/page.tsx @@ -2,7 +2,7 @@ export default function Home() { return (
- 코촉촉 메인페이지(수정77) + 코촉촉 메인페이지(수정88)
); } From 1fbbe9305c1467a5c3903a160c19a59668d84184 Mon Sep 17 00:00:00 2001 From: yunjeongLim <630yjl@gmail.com> Date: Mon, 16 Dec 2024 01:00:53 +0900 Subject: [PATCH 09/19] =?UTF-8?q?Test:=20=EA=B9=83=ED=97=88=EB=B8=8C=20?= =?UTF-8?q?=EC=95=A1=EC=85=98=20=EB=B0=B0=ED=8F=AC=20=ED=85=8C=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/(routes)/page.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/(routes)/page.tsx b/app/(routes)/page.tsx index aa72e5a..5043a4a 100644 --- a/app/(routes)/page.tsx +++ b/app/(routes)/page.tsx @@ -2,7 +2,7 @@ export default function Home() { return (
- 코촉촉 메인페이지(수정88) + 코촉촉 메인페이지(수정999)
); } From 1b903250a46786f8d8b8cde799d02c9462602dc9 Mon Sep 17 00:00:00 2001 From: yunjeongLim <630yjl@gmail.com> Date: Mon, 16 Dec 2024 01:15:51 +0900 Subject: [PATCH 10/19] =?UTF-8?q?Test:=20=EA=B9=83=ED=97=88=EB=B8=8C=20?= =?UTF-8?q?=EC=95=A1=EC=85=98=20=EB=B0=B0=ED=8F=AC=20=ED=85=8C=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/(routes)/page.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/(routes)/page.tsx b/app/(routes)/page.tsx index 5043a4a..02c5317 100644 --- a/app/(routes)/page.tsx +++ b/app/(routes)/page.tsx @@ -2,7 +2,7 @@ export default function Home() { return (
- 코촉촉 메인페이지(수정999) + 코촉촉 메인페이지(수정10)
); } From 0c47202ab8f3526462ee00fa579207257211c42a Mon Sep 17 00:00:00 2001 From: yunjeongLim <630yjl@gmail.com> Date: Mon, 16 Dec 2024 01:22:57 +0900 Subject: [PATCH 11/19] =?UTF-8?q?Test:=20=EA=B9=83=ED=97=88=EB=B8=8C=20?= =?UTF-8?q?=EC=95=A1=EC=85=98=20=EB=B0=B0=ED=8F=AC=20=ED=85=8C=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/(routes)/page.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/(routes)/page.tsx b/app/(routes)/page.tsx index 02c5317..8da9e53 100644 --- a/app/(routes)/page.tsx +++ b/app/(routes)/page.tsx @@ -2,7 +2,7 @@ export default function Home() { return (
- 코촉촉 메인페이지(수정10) + 코촉촉 메인페이지(수정11)
); } From 5936ff402979c1e0b994cbf44626c9e89da54f32 Mon Sep 17 00:00:00 2001 From: yunjeongLim <630yjl@gmail.com> Date: Mon, 16 Dec 2024 01:28:53 +0900 Subject: [PATCH 12/19] =?UTF-8?q?Test:=20=EA=B9=83=ED=97=88=EB=B8=8C=20?= =?UTF-8?q?=EC=95=A1=EC=85=98=20=EB=B0=B0=ED=8F=AC=20=ED=85=8C=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.sh | 68 +++++++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 63 insertions(+), 5 deletions(-) diff --git a/build.sh b/build.sh index e514196..a6fab18 100644 --- a/build.sh +++ b/build.sh @@ -1,10 +1,68 @@ - #!/bin/sh -cd ../ +# 현재 작업 디렉토리를 명시적으로 설정 +WORK_DIR="$(pwd)" +WEB_DIR="$WORK_DIR/web" +OUTPUT_DIR="$WORK_DIR/output" -mkdir output +# output 디렉토리 초기화 및 생성 +echo "Cleaning and creating output directory..." +rm -rf "$OUTPUT_DIR" +mkdir -p "$OUTPUT_DIR" -cp -R ./web/* ./output +# web 디렉토리에서 output 디렉토리로 파일 복사 +if [ -d "$WEB_DIR" ]; then + echo "Copying files from web to output..." + cp -R "$WEB_DIR/"* "$OUTPUT_DIR/" +else + echo "Error: $WEB_DIR does not exist." + exit 1 +fi -cp -R ./output ./web/ \ No newline at end of file +# (선택 사항) output 디렉토리 내용을 다시 web으로 복사하지 않음 +# 이 단계가 필요하지 않다면 제거하는 것이 좋습니다. +# echo "Copying files from output back to web..." +# cp -R "$OUTPUT_DIR/"* "$WEB_DIR/" + +# 결과 디버깅 +echo "Output directory contents:" +ls -la "$OUTPUT_DIR" + +echo "Web directory contents:" +ls -la "$WEB_DIR" + +echo "Build script completed successfully." +#!/bin/sh + +# 현재 작업 디렉토리를 명시적으로 설정 +WORK_DIR="$(pwd)" +WEB_DIR="$WORK_DIR/web" +OUTPUT_DIR="$WORK_DIR/output" + +# output 디렉토리 초기화 및 생성 +echo "Cleaning and creating output directory..." +rm -rf "$OUTPUT_DIR" +mkdir -p "$OUTPUT_DIR" + +# web 디렉토리에서 output 디렉토리로 파일 복사 +if [ -d "$WEB_DIR" ]; then + echo "Copying files from web to output..." + cp -R "$WEB_DIR/"* "$OUTPUT_DIR/" +else + echo "Error: $WEB_DIR does not exist." + exit 1 +fi + +# (선택 사항) output 디렉토리 내용을 다시 web으로 복사하지 않음 +# 이 단계가 필요하지 않다면 제거하는 것이 좋습니다. +# echo "Copying files from output back to web..." +# cp -R "$OUTPUT_DIR/"* "$WEB_DIR/" + +# 결과 디버깅 +echo "Output directory contents:" +ls -la "$OUTPUT_DIR" + +echo "Web directory contents:" +ls -la "$WEB_DIR" + +echo "Build script completed successfully." From 3fff04a87f0e484004fd281081f0d76a3765d77e Mon Sep 17 00:00:00 2001 From: yunjeongLim <630yjl@gmail.com> Date: Mon, 16 Dec 2024 01:37:21 +0900 Subject: [PATCH 13/19] Create main.yml --- .github/workflows/main.yml | 67 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) create mode 100644 .github/workflows/main.yml diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml new file mode 100644 index 0000000..ad82462 --- /dev/null +++ b/.github/workflows/main.yml @@ -0,0 +1,67 @@ +name: Deploy + + + +on: + + push: + + branches: ['main'] + + + +jobs: + + build: + + runs-on: ubuntu-latest + + container: pandoc/latex + + steps: + + - uses: actions/checkout@v2 + + + + - name: Install mustache (to update the date) + + run: apk add ruby && gem install mustache + + + + - name: creates output + + run: sh ./build.sh + + + + - name: Pushes to another repository + + id: push_directory + + uses: cpina/github-action-push-to-another-repository@main + + env: + + API_TOKEN_GITHUB: ${{ secrets.AUTO_ACTIONS }} + + with: + + source-directory: 'output' + + destination-github-username: 630yjl + + destination-repository-name: ko-chock-chock-web + + user-email: ${{ secrets.EMAIL }} + + commit-message: ${{ github.event.commits[0].message }} + + target-branch: main + + + + - name: Test get variable exported by push-to-another-repository + + run: echo $DESTINATION_CLONED_DIRECTORY From d7df5b168d4d67fce5d295cced5b2036a487ec5e Mon Sep 17 00:00:00 2001 From: yunjeongLim <630yjl@gmail.com> Date: Mon, 16 Dec 2024 01:37:47 +0900 Subject: [PATCH 14/19] =?UTF-8?q?Test:=20=EA=B9=83=ED=97=88=EB=B8=8C=20?= =?UTF-8?q?=EC=95=A1=EC=85=98=20=EB=B0=B0=ED=8F=AC=20=ED=85=8C=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/(routes)/page.tsx | 2 +- build.sh | 68 ++++--------------------------------------- 2 files changed, 6 insertions(+), 64 deletions(-) diff --git a/app/(routes)/page.tsx b/app/(routes)/page.tsx index 8da9e53..61473b3 100644 --- a/app/(routes)/page.tsx +++ b/app/(routes)/page.tsx @@ -2,7 +2,7 @@ export default function Home() { return (
- 코촉촉 메인페이지(수정11) + 코촉촉 메인페이지(수정12)
); } diff --git a/build.sh b/build.sh index a6fab18..e514196 100644 --- a/build.sh +++ b/build.sh @@ -1,68 +1,10 @@ + #!/bin/sh -# 현재 작업 디렉토리를 명시적으로 설정 -WORK_DIR="$(pwd)" -WEB_DIR="$WORK_DIR/web" -OUTPUT_DIR="$WORK_DIR/output" +cd ../ -# output 디렉토리 초기화 및 생성 -echo "Cleaning and creating output directory..." -rm -rf "$OUTPUT_DIR" -mkdir -p "$OUTPUT_DIR" +mkdir output -# web 디렉토리에서 output 디렉토리로 파일 복사 -if [ -d "$WEB_DIR" ]; then - echo "Copying files from web to output..." - cp -R "$WEB_DIR/"* "$OUTPUT_DIR/" -else - echo "Error: $WEB_DIR does not exist." - exit 1 -fi +cp -R ./web/* ./output -# (선택 사항) output 디렉토리 내용을 다시 web으로 복사하지 않음 -# 이 단계가 필요하지 않다면 제거하는 것이 좋습니다. -# echo "Copying files from output back to web..." -# cp -R "$OUTPUT_DIR/"* "$WEB_DIR/" - -# 결과 디버깅 -echo "Output directory contents:" -ls -la "$OUTPUT_DIR" - -echo "Web directory contents:" -ls -la "$WEB_DIR" - -echo "Build script completed successfully." -#!/bin/sh - -# 현재 작업 디렉토리를 명시적으로 설정 -WORK_DIR="$(pwd)" -WEB_DIR="$WORK_DIR/web" -OUTPUT_DIR="$WORK_DIR/output" - -# output 디렉토리 초기화 및 생성 -echo "Cleaning and creating output directory..." -rm -rf "$OUTPUT_DIR" -mkdir -p "$OUTPUT_DIR" - -# web 디렉토리에서 output 디렉토리로 파일 복사 -if [ -d "$WEB_DIR" ]; then - echo "Copying files from web to output..." - cp -R "$WEB_DIR/"* "$OUTPUT_DIR/" -else - echo "Error: $WEB_DIR does not exist." - exit 1 -fi - -# (선택 사항) output 디렉토리 내용을 다시 web으로 복사하지 않음 -# 이 단계가 필요하지 않다면 제거하는 것이 좋습니다. -# echo "Copying files from output back to web..." -# cp -R "$OUTPUT_DIR/"* "$WEB_DIR/" - -# 결과 디버깅 -echo "Output directory contents:" -ls -la "$OUTPUT_DIR" - -echo "Web directory contents:" -ls -la "$WEB_DIR" - -echo "Build script completed successfully." +cp -R ./output ./web/ \ No newline at end of file From 9ef36724d731386fe95839f77690bc14ef61333a Mon Sep 17 00:00:00 2001 From: yunjeongLim <630yjl@gmail.com> Date: Mon, 16 Dec 2024 01:46:34 +0900 Subject: [PATCH 15/19] =?UTF-8?q?Test:=20=EA=B9=83=ED=97=88=EB=B8=8C=20?= =?UTF-8?q?=EC=95=A1=EC=85=98=20=EB=B0=B0=ED=8F=AC=20=ED=85=8C=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/deploy.yml | 67 ------------------------------------ .github/workflows/main.yml | 2 +- 2 files changed, 1 insertion(+), 68 deletions(-) delete mode 100644 .github/workflows/deploy.yml diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml deleted file mode 100644 index 9591fde..0000000 --- a/.github/workflows/deploy.yml +++ /dev/null @@ -1,67 +0,0 @@ -name: Deploy - - - -on: - - push: - - branches: ['main'] - - - -jobs: - - build: - - runs-on: ubuntu-latest - - container: pandoc/latex - - steps: - - - uses: actions/checkout@v2 - - - - - name: Install mustache (to update the date) - - run: apk add ruby && gem install mustache - - - - - name: creates output - - run: sh ./build.sh - - - - - name: Pushes to another repository - - id: push_directory - - uses: cpina/github-action-push-to-another-repository@main - - env: - - API_TOKEN_GITHUB: ${{ secrets.AUTO_ACTIONS }} - - with: - - source-directory: 'output' - - destination-github-username: 630yjl - - destination-repository-name: ko-chock-chock-web - - user-email: ${{ secrets.EMAIL }} - - commit-message: ${{ github.event.commits[0].message }} - - target-branch: main - - - - - name: Test get variable exported by push-to-another-repository - - run: echo $DESTINATION_CLONED_DIRECTORY \ No newline at end of file diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ad82462..1158f2e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -50,7 +50,7 @@ jobs: source-directory: 'output' - destination-github-username: 630yjl + destination-github-username: yunjeongLim destination-repository-name: ko-chock-chock-web From 4619f3bf6bba6847929c6e91d4437b417134b31e Mon Sep 17 00:00:00 2001 From: yunjeongLim <630yjl@gmail.com> Date: Mon, 16 Dec 2024 01:59:33 +0900 Subject: [PATCH 16/19] =?UTF-8?q?Test:=20=EA=B9=83=ED=97=88=EB=B8=8C=20?= =?UTF-8?q?=EC=95=A1=EC=85=98=20=EB=B0=B0=ED=8F=AC=20=ED=85=8C=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.sh | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/build.sh b/build.sh index e514196..2fb8f82 100644 --- a/build.sh +++ b/build.sh @@ -1,10 +1,32 @@ - #!/bin/sh +# 상위 디렉토리로 이동 cd ../ +# output 디렉토리 생성 (기존 디렉토리가 존재하면 삭제) +rm -rf output mkdir output -cp -R ./web/* ./output +# 레포지토리 경로 설정 +REPO_DIR="./ko-chock-chock/web" -cp -R ./output ./web/ \ No newline at end of file +# 레포지토리의 내용이 있는지 확인 +if [ -d "$REPO_DIR" ]; then + echo "Copying files from $REPO_DIR to output directory..." + cp -R "$REPO_DIR/"* ./output + + echo "Copying files back to $REPO_DIR..." + cp -R ./output/* "$REPO_DIR/" +else + echo "Error: Directory $REPO_DIR does not exist." + exit 1 +fi + +# 결과 디버깅 +echo "Output directory contents:" +ls -la ./output + +echo "Repository directory ($REPO_DIR) contents:" +ls -la "$REPO_DIR" + +echo "Build script completed successfully." From 21ef72a93728bb6ab135f6d2b49af62ce5f473c9 Mon Sep 17 00:00:00 2001 From: yunjeongLim <630yjl@gmail.com> Date: Mon, 16 Dec 2024 02:00:59 +0900 Subject: [PATCH 17/19] =?UTF-8?q?Test:=20=EA=B9=83=ED=97=88=EB=B8=8C=20?= =?UTF-8?q?=EC=95=A1=EC=85=98=20=EB=B0=B0=ED=8F=AC=20=ED=85=8C=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.sh | 25 ++++--------------------- 1 file changed, 4 insertions(+), 21 deletions(-) diff --git a/build.sh b/build.sh index 2fb8f82..b308f34 100644 --- a/build.sh +++ b/build.sh @@ -1,32 +1,15 @@ #!/bin/sh -# 상위 디렉토리로 이동 -cd ../ - # output 디렉토리 생성 (기존 디렉토리가 존재하면 삭제) rm -rf output mkdir output -# 레포지토리 경로 설정 -REPO_DIR="./ko-chock-chock/web" - -# 레포지토리의 내용이 있는지 확인 -if [ -d "$REPO_DIR" ]; then - echo "Copying files from $REPO_DIR to output directory..." - cp -R "$REPO_DIR/"* ./output +# 현재 디렉토리의 내용을 output으로 복사 +echo "Copying files from current directory to output directory..." +cp -R ./* ./output - echo "Copying files back to $REPO_DIR..." - cp -R ./output/* "$REPO_DIR/" -else - echo "Error: Directory $REPO_DIR does not exist." - exit 1 -fi - -# 결과 디버깅 +# 결과 확인 echo "Output directory contents:" ls -la ./output -echo "Repository directory ($REPO_DIR) contents:" -ls -la "$REPO_DIR" - echo "Build script completed successfully." From b59efe2fa0fa4401cd6b154068beda0d332e28e9 Mon Sep 17 00:00:00 2001 From: yunjeongLim <630yjl@gmail.com> Date: Mon, 16 Dec 2024 02:08:00 +0900 Subject: [PATCH 18/19] =?UTF-8?q?Test:=20=EA=B9=83=ED=97=88=EB=B8=8C=20?= =?UTF-8?q?=EC=95=A1=EC=85=98=20=EB=B0=B0=ED=8F=AC=20=ED=85=8C=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/(routes)/page.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/(routes)/page.tsx b/app/(routes)/page.tsx index 61473b3..8fe6ba8 100644 --- a/app/(routes)/page.tsx +++ b/app/(routes)/page.tsx @@ -2,7 +2,7 @@ export default function Home() { return (
- 코촉촉 메인페이지(수정12) + 코촉촉 메인페이지(수정13)
); } From d4916b6d35f62c3440babeff43f6cc4578c27cfc Mon Sep 17 00:00:00 2001 From: yunjeongLim <630yjl@gmail.com> Date: Mon, 16 Dec 2024 02:09:25 +0900 Subject: [PATCH 19/19] =?UTF-8?q?Test:=20=EA=B9=83=ED=97=88=EB=B8=8C=20?= =?UTF-8?q?=EC=95=A1=EC=85=98=20=EB=B0=B0=ED=8F=AC=20=ED=85=8C=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 2 +- build.sh | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index fd3dbb5..68d0e9e 100644 --- a/.gitignore +++ b/.gitignore @@ -14,7 +14,7 @@ /out/ # production -/build +# /build # misc .DS_Store diff --git a/build.sh b/build.sh index b308f34..b38f811 100644 --- a/build.sh +++ b/build.sh @@ -13,3 +13,6 @@ echo "Output directory contents:" ls -la ./output echo "Build script completed successfully." + + +