From e04baafc2509bf674e96fcededf01360d51bfb04 Mon Sep 17 00:00:00 2001 From: david Date: Thu, 3 Apr 2025 16:13:12 -0700 Subject: [PATCH 01/10] add deploy script --- .gitea/workflows/deploy.yml | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 .gitea/workflows/deploy.yml diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml new file mode 100644 index 0000000..8e55490 --- /dev/null +++ b/.gitea/workflows/deploy.yml @@ -0,0 +1,23 @@ +name: Deploy to Pi + +on: + push: + branches: + - actions + +jobs: + deploy: + runs-on: self-hosted + + steps: + - name: Checkout code + uses: actions/checkout@v3 + + - name: Stop existing server + run: | + pkill -f 'python3 -m http.server' || true + + - name: Start server + run: | + chmod +x ./start.sh + nohup ./start.sh > server.log 2>&1 & From 7dd7a5ef8ef22e12d4b67fa4a35806b234959203 Mon Sep 17 00:00:00 2001 From: david Date: Thu, 3 Apr 2025 19:04:53 -0700 Subject: [PATCH 02/10] script update --- .gitea/workflows/deploy.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index 8e55490..61a3fa8 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -11,7 +11,10 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v3 + run: | + cd ~/personal-site + git checkout main + git pull origin main - name: Stop existing server run: | From e57323aa3eb4f79ac8250754dbeabb264ae272b2 Mon Sep 17 00:00:00 2001 From: david Date: Thu, 3 Apr 2025 19:05:30 -0700 Subject: [PATCH 03/10] run update --- .gitea/workflows/deploy.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index 61a3fa8..4b3e08a 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -22,5 +22,6 @@ jobs: - name: Start server run: | + cd ~/personal-site chmod +x ./start.sh nohup ./start.sh > server.log 2>&1 & From 9df235f379712d14ef4fe55d0badc8f6a054a002 Mon Sep 17 00:00:00 2001 From: david Date: Thu, 3 Apr 2025 19:12:12 -0700 Subject: [PATCH 04/10] update start script --- dev.sh | 13 +++++++++++++ start.sh | 12 +----------- 2 files changed, 14 insertions(+), 11 deletions(-) create mode 100755 dev.sh diff --git a/dev.sh b/dev.sh new file mode 100755 index 0000000..cda708d --- /dev/null +++ b/dev.sh @@ -0,0 +1,13 @@ +#!/bin/bash +sassc css/style.scss css/style.css +python3 -m http.server 8080 & + +# Keypress loop +while true; do + read -n 1 -s key + if [[ $key == "r" ]]; then + echo -e "\nRecompiling SCSS..." + sassc css/style.scss css/style.css && echo "Done." + fi +done + diff --git a/start.sh b/start.sh index cda708d..f041963 100755 --- a/start.sh +++ b/start.sh @@ -1,13 +1,3 @@ #!/bin/bash sassc css/style.scss css/style.css -python3 -m http.server 8080 & - -# Keypress loop -while true; do - read -n 1 -s key - if [[ $key == "r" ]]; then - echo -e "\nRecompiling SCSS..." - sassc css/style.scss css/style.css && echo "Done." - fi -done - +python3 -m http.server 8080 From 31b4b3698d5d6e049d536f88bef70a8812d96b37 Mon Sep 17 00:00:00 2001 From: david Date: Thu, 3 Apr 2025 19:20:38 -0700 Subject: [PATCH 05/10] test commit --- .gitea/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index 4b3e08a..0d62e18 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -16,7 +16,7 @@ jobs: git checkout main git pull origin main - - name: Stop existing server + - name: Stop existing server, if running run: | pkill -f 'python3 -m http.server' || true From d2bde2d3a4c5234297c0d7249f5d25510cf327b6 Mon Sep 17 00:00:00 2001 From: david Date: Thu, 3 Apr 2025 19:22:01 -0700 Subject: [PATCH 06/10] change branch name --- .gitea/workflows/deploy.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index 0d62e18..6806c8b 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -13,8 +13,8 @@ jobs: - name: Checkout code run: | cd ~/personal-site - git checkout main - git pull origin main + git checkout actions + git pull origin actions - name: Stop existing server, if running run: | From f40f5f66439649a57b40b9ced7ceab9f939a2975 Mon Sep 17 00:00:00 2001 From: david Date: Thu, 3 Apr 2025 19:34:20 -0700 Subject: [PATCH 07/10] & changes --- .gitea/workflows/deploy.yml | 2 +- start.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index 6806c8b..7714f35 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -24,4 +24,4 @@ jobs: run: | cd ~/personal-site chmod +x ./start.sh - nohup ./start.sh > server.log 2>&1 & + ./start.sh > server.log 2>&1 diff --git a/start.sh b/start.sh index f041963..c2d8030 100755 --- a/start.sh +++ b/start.sh @@ -1,3 +1,3 @@ #!/bin/bash sassc css/style.scss css/style.css -python3 -m http.server 8080 +python3 -m http.server 8080 & From b7c5b1e8b7a707e89f4824da3318410003081cdf Mon Sep 17 00:00:00 2001 From: david Date: Thu, 3 Apr 2025 19:37:09 -0700 Subject: [PATCH 08/10] exec --- .gitea/workflows/deploy.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index 7714f35..04bf5cf 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -24,4 +24,5 @@ jobs: run: | cd ~/personal-site chmod +x ./start.sh - ./start.sh > server.log 2>&1 + sassc css/style.scss css/style.css + exec python3 -m http.server 8080 > server.log 2>&1 From fd6ece4f74a691eb12bc3edc00425f484fbb867a Mon Sep 17 00:00:00 2001 From: david Date: Thu, 3 Apr 2025 19:37:57 -0700 Subject: [PATCH 09/10] revert dev --- dev.sh | 13 ------------- start.sh | 10 ++++++++++ 2 files changed, 10 insertions(+), 13 deletions(-) delete mode 100755 dev.sh diff --git a/dev.sh b/dev.sh deleted file mode 100755 index cda708d..0000000 --- a/dev.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash -sassc css/style.scss css/style.css -python3 -m http.server 8080 & - -# Keypress loop -while true; do - read -n 1 -s key - if [[ $key == "r" ]]; then - echo -e "\nRecompiling SCSS..." - sassc css/style.scss css/style.css && echo "Done." - fi -done - diff --git a/start.sh b/start.sh index c2d8030..cda708d 100755 --- a/start.sh +++ b/start.sh @@ -1,3 +1,13 @@ #!/bin/bash sassc css/style.scss css/style.css python3 -m http.server 8080 & + +# Keypress loop +while true; do + read -n 1 -s key + if [[ $key == "r" ]]; then + echo -e "\nRecompiling SCSS..." + sassc css/style.scss css/style.css && echo "Done." + fi +done + From 6001f860fb575d60a93ebcc604082e3d5431de56 Mon Sep 17 00:00:00 2001 From: david Date: Thu, 3 Apr 2025 19:41:37 -0700 Subject: [PATCH 10/10] final touches --- .gitea/workflows/deploy.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index 04bf5cf..d7c30c5 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -1,4 +1,4 @@ -name: Deploy to Pi +name: Personal Website - Run Python HTTP Server on: push: @@ -9,12 +9,15 @@ jobs: deploy: runs-on: self-hosted + env: + PORT: 8080 + steps: - name: Checkout code run: | cd ~/personal-site - git checkout actions - git pull origin actions + git checkout $GITEA_REF_NAME + git pull origin $GITEA_REF_NAME - name: Stop existing server, if running run: | @@ -25,4 +28,4 @@ jobs: cd ~/personal-site chmod +x ./start.sh sassc css/style.scss css/style.css - exec python3 -m http.server 8080 > server.log 2>&1 + exec python3 -m http.server $PORT > server.log 2>&1