From 5e8700649166451549f37d2319e6e368bb533fe7 Mon Sep 17 00:00:00 2001 From: shockrah Date: Wed, 11 Sep 2024 21:26:55 -0700 Subject: [PATCH 01/36] readme re-trigger workflow --- readme.md | 1 + 1 file changed, 1 insertion(+) diff --git a/readme.md b/readme.md index 719c146..3421c54 100644 --- a/readme.md +++ b/readme.md @@ -55,3 +55,4 @@ Each file entry in the education folder requires the following fields: * when : `plain string` * degree : `plain string` * rank : `number` + From 080d0c4f7c39cdeb7bd789879698923b3d88a00f Mon Sep 17 00:00:00 2001 From: shockrah Date: Wed, 11 Sep 2024 21:27:56 -0700 Subject: [PATCH 02/36] using webfactory/ssh-agent --- .gitea/workflows/build-and-deploy.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.gitea/workflows/build-and-deploy.yml b/.gitea/workflows/build-and-deploy.yml index bd9da0c..a739418 100644 --- a/.gitea/workflows/build-and-deploy.yml +++ b/.gitea/workflows/build-and-deploy.yml @@ -23,5 +23,3 @@ jobs: uses: webfactory/ssh-agent@v0.9.0 with: ssh-private-key: ${{ secrets.PRIVATE_KEY }} - - name: SCP Files to resume web server - run: "scp -o UserKnownHostsFile=/dev/null -r public/ $ssh_target:$remote_path" From cce93bd520e7d253d7adff6b72e0848341b8badf Mon Sep 17 00:00:00 2001 From: shockrah Date: Wed, 11 Sep 2024 21:28:58 -0700 Subject: [PATCH 03/36] Copy files with scp at end of workflow --- .gitea/workflows/build-and-deploy.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitea/workflows/build-and-deploy.yml b/.gitea/workflows/build-and-deploy.yml index a739418..bd9da0c 100644 --- a/.gitea/workflows/build-and-deploy.yml +++ b/.gitea/workflows/build-and-deploy.yml @@ -23,3 +23,5 @@ jobs: uses: webfactory/ssh-agent@v0.9.0 with: ssh-private-key: ${{ secrets.PRIVATE_KEY }} + - name: SCP Files to resume web server + run: "scp -o UserKnownHostsFile=/dev/null -r public/ $ssh_target:$remote_path" From 63d211e60d647ace0e2eeef9471d89a224cc2dd2 Mon Sep 17 00:00:00 2001 From: shockrah Date: Wed, 11 Sep 2024 21:30:19 -0700 Subject: [PATCH 04/36] hard set the user@host --- .gitea/workflows/build-and-deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build-and-deploy.yml b/.gitea/workflows/build-and-deploy.yml index bd9da0c..76e07c0 100644 --- a/.gitea/workflows/build-and-deploy.yml +++ b/.gitea/workflows/build-and-deploy.yml @@ -8,7 +8,7 @@ jobs: setup-website-content: env: remote_path: "/opt/nginx/test.shockrah.xyz" - ssh_target: "${{ secrets.USER }}@${{ secrets.HOST }}" + ssh_target: "html-deployer@shockrah.xyz" runs-on: ubuntu-latest container: image: shockrah/hugo From ac9a1f65e6719b1aa32ca5105c99efa779660567 Mon Sep 17 00:00:00 2001 From: shockrah Date: Wed, 11 Sep 2024 21:35:12 -0700 Subject: [PATCH 05/36] single step scp in action --- .gitea/workflows/build-and-deploy.yml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/.gitea/workflows/build-and-deploy.yml b/.gitea/workflows/build-and-deploy.yml index 76e07c0..ee7d817 100644 --- a/.gitea/workflows/build-and-deploy.yml +++ b/.gitea/workflows/build-and-deploy.yml @@ -19,9 +19,12 @@ jobs: run: hugo - name: Setup the hostname with the private key that we have run: mkdir -p ~/.ssh/ && ssh-keyscan git.shockrah.xyz >> ~/.ssh/known_hosts - - name: Setup SSH to copy files up to remote webserver - uses: webfactory/ssh-agent@v0.9.0 + - name: SCP Files with marketplace action + uses: appleboy/scp-action@v0.1.7 with: - ssh-private-key: ${{ secrets.PRIVATE_KEY }} - - name: SCP Files to resume web server - run: "scp -o UserKnownHostsFile=/dev/null -r public/ $ssh_target:$remote_path" + host: ${{ secrets.HOST }} + username: ${{ secrets.USER }} + port: ${{ secrets.PORT }} + key: ${{ secrets.PRIVATE_KEY }} + source: public/ + target: /opt/nginx/test.shockrah.xyz From 7f082cde346e47b92c1b4427ce669805861104ac Mon Sep 17 00:00:00 2001 From: shockrah Date: Wed, 11 Sep 2024 21:41:07 -0700 Subject: [PATCH 06/36] Removing unnecessary steps --- .gitea/workflows/build-and-deploy.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.gitea/workflows/build-and-deploy.yml b/.gitea/workflows/build-and-deploy.yml index ee7d817..41a563d 100644 --- a/.gitea/workflows/build-and-deploy.yml +++ b/.gitea/workflows/build-and-deploy.yml @@ -17,14 +17,11 @@ jobs: uses: actions/checkout@v4 - name: Build website content run: hugo - - name: Setup the hostname with the private key that we have - run: mkdir -p ~/.ssh/ && ssh-keyscan git.shockrah.xyz >> ~/.ssh/known_hosts - name: SCP Files with marketplace action uses: appleboy/scp-action@v0.1.7 with: - host: ${{ secrets.HOST }} + host: shockrah.xyz username: ${{ secrets.USER }} - port: ${{ secrets.PORT }} key: ${{ secrets.PRIVATE_KEY }} source: public/ target: /opt/nginx/test.shockrah.xyz From 1a3cbfa43b5e2cbbefedfbb14260a828ee342d87 Mon Sep 17 00:00:00 2001 From: shockrah Date: Wed, 11 Sep 2024 21:48:39 -0700 Subject: [PATCH 07/36] old method of doing ssh setup and cop[ying of files --- .gitea/workflows/build-and-deploy.yml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/.gitea/workflows/build-and-deploy.yml b/.gitea/workflows/build-and-deploy.yml index 41a563d..1bef818 100644 --- a/.gitea/workflows/build-and-deploy.yml +++ b/.gitea/workflows/build-and-deploy.yml @@ -17,11 +17,12 @@ jobs: uses: actions/checkout@v4 - name: Build website content run: hugo - - name: SCP Files with marketplace action - uses: appleboy/scp-action@v0.1.7 - with: - host: shockrah.xyz - username: ${{ secrets.USER }} - key: ${{ secrets.PRIVATE_KEY }} - source: public/ - target: /opt/nginx/test.shockrah.xyz + - name: SSH Setup and Copy + run: | + eval $(ssh-agent -s) \ + echo "${{ secrets.PRIVATE_KEY }}" | ssh-add - > /dev/null \ + mkdir -p ~/.ssh \ + chmod 0700 ~/.ssh \ + scp -o UserKnownHostsFile=/dev/null -r public/ $ssh_target:$remote_path + + From 0857d8edd62492a539a5476ed235cbe69d3c8cc1 Mon Sep 17 00:00:00 2001 From: shockrah Date: Wed, 11 Sep 2024 22:03:33 -0700 Subject: [PATCH 08/36] downgrading scp action version --- .gitea/workflows/build-and-deploy.yml | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/.gitea/workflows/build-and-deploy.yml b/.gitea/workflows/build-and-deploy.yml index 1bef818..0e4b23c 100644 --- a/.gitea/workflows/build-and-deploy.yml +++ b/.gitea/workflows/build-and-deploy.yml @@ -17,12 +17,11 @@ jobs: uses: actions/checkout@v4 - name: Build website content run: hugo - - name: SSH Setup and Copy - run: | - eval $(ssh-agent -s) \ - echo "${{ secrets.PRIVATE_KEY }}" | ssh-add - > /dev/null \ - mkdir -p ~/.ssh \ - chmod 0700 ~/.ssh \ - scp -o UserKnownHostsFile=/dev/null -r public/ $ssh_target:$remote_path - - + - name: Copy using scp-action + uses: appleboy/scp-action@v0.1.3 + with: + host: shockrah.xyz + username: html-deployer + key: ${{ secrets.PRIVATE_KEY }} + source: public/ + target: /opt/nginx/test.shockrah.xyz From 5f035fac720814e6bc4e7b931a011da6304e5c04 Mon Sep 17 00:00:00 2001 From: shockrah Date: Wed, 11 Sep 2024 22:14:27 -0700 Subject: [PATCH 09/36] simpler workflow --- .gitea/workflows/build-and-deploy.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/build-and-deploy.yml b/.gitea/workflows/build-and-deploy.yml index 0e4b23c..91d8902 100644 --- a/.gitea/workflows/build-and-deploy.yml +++ b/.gitea/workflows/build-and-deploy.yml @@ -18,10 +18,11 @@ jobs: - name: Build website content run: hugo - name: Copy using scp-action - uses: appleboy/scp-action@v0.1.3 + uses: srueda99/scp-action@v12 with: host: shockrah.xyz - username: html-deployer + port: 22 + username: ${{ secrets.USER }} key: ${{ secrets.PRIVATE_KEY }} source: public/ target: /opt/nginx/test.shockrah.xyz From a603a456c1523ab2cc9a13c6531ee56315e693e0 Mon Sep 17 00:00:00 2001 From: shockrah Date: Wed, 25 Sep 2024 19:24:04 -0700 Subject: [PATCH 10/36] Specify origin folder --- .gitea/workflows/build-and-deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build-and-deploy.yml b/.gitea/workflows/build-and-deploy.yml index 91d8902..0036187 100644 --- a/.gitea/workflows/build-and-deploy.yml +++ b/.gitea/workflows/build-and-deploy.yml @@ -24,5 +24,5 @@ jobs: port: 22 username: ${{ secrets.USER }} key: ${{ secrets.PRIVATE_KEY }} - source: public/ + origin: "public/*" target: /opt/nginx/test.shockrah.xyz From 30aee2817262b106c75e4d6b279e276dccf37296 Mon Sep 17 00:00:00 2001 From: shockrah Date: Wed, 25 Sep 2024 20:21:22 -0700 Subject: [PATCH 11/36] Using v0.1.3 of appleboy/scp-action --- .gitea/workflows/build-and-deploy.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.gitea/workflows/build-and-deploy.yml b/.gitea/workflows/build-and-deploy.yml index 0036187..1d8a9f3 100644 --- a/.gitea/workflows/build-and-deploy.yml +++ b/.gitea/workflows/build-and-deploy.yml @@ -17,6 +17,14 @@ jobs: uses: actions/checkout@v4 - name: Build website content run: hugo + - name: Copy files using scp-action + uses: appleboy/scp-action@v0.1.3 + with: + host: shockrah.xyz + username: ${{ secrets.USER }} + source: "public/*" + target: /opt/nginx/test.shockrah.xyz + key: ${{ secrets.PRIVATE_KEY }} - name: Copy using scp-action uses: srueda99/scp-action@v12 with: From fa022786744f02727854745a486133b1f06eb06d Mon Sep 17 00:00:00 2001 From: shockrah Date: Thu, 26 Sep 2024 19:44:41 -0700 Subject: [PATCH 12/36] Using personal scp-action thing --- .gitea/workflows/build-and-deploy.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/build-and-deploy.yml b/.gitea/workflows/build-and-deploy.yml index 1d8a9f3..cbe6373 100644 --- a/.gitea/workflows/build-and-deploy.yml +++ b/.gitea/workflows/build-and-deploy.yml @@ -18,11 +18,11 @@ jobs: - name: Build website content run: hugo - name: Copy files using scp-action - uses: appleboy/scp-action@v0.1.3 + uses: tempersama/scp-action@v1.2 with: host: shockrah.xyz username: ${{ secrets.USER }} - source: "public/*" + source: "public/" target: /opt/nginx/test.shockrah.xyz key: ${{ secrets.PRIVATE_KEY }} - name: Copy using scp-action From 1147f61d7d9b041e03097e669f79f8b0522d26b8 Mon Sep 17 00:00:00 2001 From: shockrah Date: Thu, 26 Sep 2024 19:45:37 -0700 Subject: [PATCH 13/36] Fixing version tag --- .gitea/workflows/build-and-deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build-and-deploy.yml b/.gitea/workflows/build-and-deploy.yml index cbe6373..94e042d 100644 --- a/.gitea/workflows/build-and-deploy.yml +++ b/.gitea/workflows/build-and-deploy.yml @@ -18,7 +18,7 @@ jobs: - name: Build website content run: hugo - name: Copy files using scp-action - uses: tempersama/scp-action@v1.2 + uses: tempersama/scp-action@1.2 with: host: shockrah.xyz username: ${{ secrets.USER }} From a6da939feaf2098dff8280c0908c5af0cc80c844 Mon Sep 17 00:00:00 2001 From: shockrah Date: Thu, 26 Sep 2024 19:51:10 -0700 Subject: [PATCH 14/36] Bumping scp version --- .gitea/workflows/build-and-deploy.yml | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/.gitea/workflows/build-and-deploy.yml b/.gitea/workflows/build-and-deploy.yml index 94e042d..e2e27d7 100644 --- a/.gitea/workflows/build-and-deploy.yml +++ b/.gitea/workflows/build-and-deploy.yml @@ -18,19 +18,10 @@ jobs: - name: Build website content run: hugo - name: Copy files using scp-action - uses: tempersama/scp-action@1.2 + uses: tempersama/scp-action@1.3 with: host: shockrah.xyz username: ${{ secrets.USER }} source: "public/" target: /opt/nginx/test.shockrah.xyz key: ${{ secrets.PRIVATE_KEY }} - - name: Copy using scp-action - uses: srueda99/scp-action@v12 - with: - host: shockrah.xyz - port: 22 - username: ${{ secrets.USER }} - key: ${{ secrets.PRIVATE_KEY }} - origin: "public/*" - target: /opt/nginx/test.shockrah.xyz From fb667e045cb066a02204e98a45acc52f2ecaed5c Mon Sep 17 00:00:00 2001 From: shockrah Date: Thu, 26 Sep 2024 19:59:28 -0700 Subject: [PATCH 15/36] Debuggin --- .gitea/workflows/build-and-deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build-and-deploy.yml b/.gitea/workflows/build-and-deploy.yml index e2e27d7..25d6889 100644 --- a/.gitea/workflows/build-and-deploy.yml +++ b/.gitea/workflows/build-and-deploy.yml @@ -16,7 +16,7 @@ jobs: - name: Checkout repository resources uses: actions/checkout@v4 - name: Build website content - run: hugo + run: hugo && ls -R - name: Copy files using scp-action uses: tempersama/scp-action@1.3 with: From 07f62b400bfeb41eb73e986185731b0e7e69cddc Mon Sep 17 00:00:00 2001 From: shockrah Date: Thu, 26 Sep 2024 20:05:24 -0700 Subject: [PATCH 16/36] Bumping scp version --- .gitea/workflows/build-and-deploy.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/build-and-deploy.yml b/.gitea/workflows/build-and-deploy.yml index 25d6889..8b2782a 100644 --- a/.gitea/workflows/build-and-deploy.yml +++ b/.gitea/workflows/build-and-deploy.yml @@ -18,10 +18,10 @@ jobs: - name: Build website content run: hugo && ls -R - name: Copy files using scp-action - uses: tempersama/scp-action@1.3 + uses: tempersama/scp-action@1.4 with: host: shockrah.xyz username: ${{ secrets.USER }} - source: "public/" + origin: "public/" target: /opt/nginx/test.shockrah.xyz key: ${{ secrets.PRIVATE_KEY }} From b0395316004ec7a5ceef72c8f4d5025c34779062 Mon Sep 17 00:00:00 2001 From: shockrah Date: Thu, 26 Sep 2024 21:08:15 -0700 Subject: [PATCH 17/36] bumping to 1.5 --- .gitea/workflows/build-and-deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build-and-deploy.yml b/.gitea/workflows/build-and-deploy.yml index 8b2782a..f1bbee4 100644 --- a/.gitea/workflows/build-and-deploy.yml +++ b/.gitea/workflows/build-and-deploy.yml @@ -18,7 +18,7 @@ jobs: - name: Build website content run: hugo && ls -R - name: Copy files using scp-action - uses: tempersama/scp-action@1.4 + uses: tempersama/scp-action@1.5 with: host: shockrah.xyz username: ${{ secrets.USER }} From 2b5edfc17774246ac4dd8f874f9b9affff2303ce Mon Sep 17 00:00:00 2001 From: shockrah Date: Thu, 26 Sep 2024 21:16:52 -0700 Subject: [PATCH 18/36] trailing slash for target output --- .gitea/workflows/build-and-deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build-and-deploy.yml b/.gitea/workflows/build-and-deploy.yml index f1bbee4..3f35682 100644 --- a/.gitea/workflows/build-and-deploy.yml +++ b/.gitea/workflows/build-and-deploy.yml @@ -23,5 +23,5 @@ jobs: host: shockrah.xyz username: ${{ secrets.USER }} origin: "public/" - target: /opt/nginx/test.shockrah.xyz + target: /opt/nginx/test.shockrah.xyz/ key: ${{ secrets.PRIVATE_KEY }} From efda6a707b51c5aabe3edb5658b67e71c3ea3976 Mon Sep 17 00:00:00 2001 From: shockrah Date: Thu, 26 Sep 2024 22:55:19 -0700 Subject: [PATCH 19/36] Bumping to a more verbose version --- .gitea/workflows/build-and-deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build-and-deploy.yml b/.gitea/workflows/build-and-deploy.yml index 3f35682..b50f85e 100644 --- a/.gitea/workflows/build-and-deploy.yml +++ b/.gitea/workflows/build-and-deploy.yml @@ -18,7 +18,7 @@ jobs: - name: Build website content run: hugo && ls -R - name: Copy files using scp-action - uses: tempersama/scp-action@1.5 + uses: tempersama/scp-action@1.6 with: host: shockrah.xyz username: ${{ secrets.USER }} From d940802cbe857e94c67e8b12c14399518bb3d5eb Mon Sep 17 00:00:00 2001 From: shockrah Date: Thu, 26 Sep 2024 23:51:59 -0700 Subject: [PATCH 20/36] bumping to version with -a flag --- .gitea/workflows/build-and-deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build-and-deploy.yml b/.gitea/workflows/build-and-deploy.yml index b50f85e..60c3eb6 100644 --- a/.gitea/workflows/build-and-deploy.yml +++ b/.gitea/workflows/build-and-deploy.yml @@ -18,7 +18,7 @@ jobs: - name: Build website content run: hugo && ls -R - name: Copy files using scp-action - uses: tempersama/scp-action@1.6 + uses: tempersama/scp-action@1.7 with: host: shockrah.xyz username: ${{ secrets.USER }} From c42f2022ac9f905aad27d1119818e64c07120de1 Mon Sep 17 00:00:00 2001 From: shockrah Date: Fri, 27 Sep 2024 08:09:35 -0700 Subject: [PATCH 21/36] No trailing slash on destination --- .gitea/workflows/build-and-deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build-and-deploy.yml b/.gitea/workflows/build-and-deploy.yml index 60c3eb6..1a3118e 100644 --- a/.gitea/workflows/build-and-deploy.yml +++ b/.gitea/workflows/build-and-deploy.yml @@ -23,5 +23,5 @@ jobs: host: shockrah.xyz username: ${{ secrets.USER }} origin: "public/" - target: /opt/nginx/test.shockrah.xyz/ + target: /opt/nginx/test.shockrah.xyz key: ${{ secrets.PRIVATE_KEY }} From a199ccd37fcf134bd1195a2a615159595602a03b Mon Sep 17 00:00:00 2001 From: shockrah Date: Sat, 28 Sep 2024 14:38:27 -0700 Subject: [PATCH 22/36] Use new rsync rebranded repo with updated version and safety checks --- .gitea/workflows/build-and-deploy.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/build-and-deploy.yml b/.gitea/workflows/build-and-deploy.yml index 1a3118e..3927aef 100644 --- a/.gitea/workflows/build-and-deploy.yml +++ b/.gitea/workflows/build-and-deploy.yml @@ -17,8 +17,8 @@ jobs: uses: actions/checkout@v4 - name: Build website content run: hugo && ls -R - - name: Copy files using scp-action - uses: tempersama/scp-action@1.7 + - name: Copy files with rsync + uses: tempersama/rsync-copy@2.1 with: host: shockrah.xyz username: ${{ secrets.USER }} From a270efb9bde66eb3a1eb8706ee32232b4971c23b Mon Sep 17 00:00:00 2001 From: shockrah Date: Sat, 28 Sep 2024 14:43:26 -0700 Subject: [PATCH 23/36] Fixed version' --- .gitea/workflows/build-and-deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build-and-deploy.yml b/.gitea/workflows/build-and-deploy.yml index 3927aef..71b696b 100644 --- a/.gitea/workflows/build-and-deploy.yml +++ b/.gitea/workflows/build-and-deploy.yml @@ -18,7 +18,7 @@ jobs: - name: Build website content run: hugo && ls -R - name: Copy files with rsync - uses: tempersama/rsync-copy@2.1 + uses: tempersama/rsync-copy@2.2 with: host: shockrah.xyz username: ${{ secrets.USER }} From bd7914e2118cf49fd9ef62d66a5f7ed8b83d649d Mon Sep 17 00:00:00 2001 From: shockrah Date: Sat, 28 Sep 2024 14:47:41 -0700 Subject: [PATCH 24/36] Version bump to one without shell script issues --- .gitea/workflows/build-and-deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build-and-deploy.yml b/.gitea/workflows/build-and-deploy.yml index 71b696b..edf9330 100644 --- a/.gitea/workflows/build-and-deploy.yml +++ b/.gitea/workflows/build-and-deploy.yml @@ -18,7 +18,7 @@ jobs: - name: Build website content run: hugo && ls -R - name: Copy files with rsync - uses: tempersama/rsync-copy@2.2 + uses: tempersama/rsync-copy@2.3 with: host: shockrah.xyz username: ${{ secrets.USER }} From 8e479c538e01c5a8a80722bbf0815f5dbe597bfe Mon Sep 17 00:00:00 2001 From: shockrah Date: Sat, 28 Sep 2024 14:57:07 -0700 Subject: [PATCH 25/36] bump --- .gitea/workflows/build-and-deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build-and-deploy.yml b/.gitea/workflows/build-and-deploy.yml index edf9330..e046d6b 100644 --- a/.gitea/workflows/build-and-deploy.yml +++ b/.gitea/workflows/build-and-deploy.yml @@ -18,7 +18,7 @@ jobs: - name: Build website content run: hugo && ls -R - name: Copy files with rsync - uses: tempersama/rsync-copy@2.3 + uses: tempersama/rsync-copy@2.4 with: host: shockrah.xyz username: ${{ secrets.USER }} From c6440311966e1460824ba2dfeb29d1c1d1874a39 Mon Sep 17 00:00:00 2001 From: shockrah Date: Sat, 28 Sep 2024 15:00:52 -0700 Subject: [PATCH 26/36] Fixing missing params --- .gitea/workflows/build-and-deploy.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/build-and-deploy.yml b/.gitea/workflows/build-and-deploy.yml index e046d6b..53e832a 100644 --- a/.gitea/workflows/build-and-deploy.yml +++ b/.gitea/workflows/build-and-deploy.yml @@ -22,6 +22,6 @@ jobs: with: host: shockrah.xyz username: ${{ secrets.USER }} - origin: "public/" - target: /opt/nginx/test.shockrah.xyz + source: "public/" + destination: /opt/nginx/test.shockrah.xyz key: ${{ secrets.PRIVATE_KEY }} From f4d97809b9506f00314f7e84b5d6255a13f609bb Mon Sep 17 00:00:00 2001 From: shockrah Date: Sat, 28 Sep 2024 15:02:38 -0700 Subject: [PATCH 27/36] Debugging file paths --- .gitea/workflows/build-and-deploy.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.gitea/workflows/build-and-deploy.yml b/.gitea/workflows/build-and-deploy.yml index 53e832a..b0a980f 100644 --- a/.gitea/workflows/build-and-deploy.yml +++ b/.gitea/workflows/build-and-deploy.yml @@ -6,9 +6,6 @@ on: jobs: setup-website-content: - env: - remote_path: "/opt/nginx/test.shockrah.xyz" - ssh_target: "html-deployer@shockrah.xyz" runs-on: ubuntu-latest container: image: shockrah/hugo @@ -16,7 +13,7 @@ jobs: - name: Checkout repository resources uses: actions/checkout@v4 - name: Build website content - run: hugo && ls -R + run: hugo && pwd && ls -R - name: Copy files with rsync uses: tempersama/rsync-copy@2.4 with: From 94c8a7d945b279f7b6919e0908e7cf8ff50a51d6 Mon Sep 17 00:00:00 2001 From: shockrah Date: Sat, 28 Sep 2024 15:35:12 -0700 Subject: [PATCH 28/36] Bumping version to 2.5 --- .gitea/workflows/build-and-deploy.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/build-and-deploy.yml b/.gitea/workflows/build-and-deploy.yml index b0a980f..1d6ec22 100644 --- a/.gitea/workflows/build-and-deploy.yml +++ b/.gitea/workflows/build-and-deploy.yml @@ -15,10 +15,10 @@ jobs: - name: Build website content run: hugo && pwd && ls -R - name: Copy files with rsync - uses: tempersama/rsync-copy@2.4 + uses: tempersama/rsync-copy@2.5 with: host: shockrah.xyz - username: ${{ secrets.USER }} + username: nginx source: "public/" destination: /opt/nginx/test.shockrah.xyz key: ${{ secrets.PRIVATE_KEY }} From 11a355684f85d5e2b9d6c1d5b767c857d711048a Mon Sep 17 00:00:00 2001 From: shockrah Date: Sat, 28 Sep 2024 15:36:43 -0700 Subject: [PATCH 29/36] Using secrets username --- .gitea/workflows/build-and-deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build-and-deploy.yml b/.gitea/workflows/build-and-deploy.yml index 1d6ec22..a2f92f6 100644 --- a/.gitea/workflows/build-and-deploy.yml +++ b/.gitea/workflows/build-and-deploy.yml @@ -18,7 +18,7 @@ jobs: uses: tempersama/rsync-copy@2.5 with: host: shockrah.xyz - username: nginx + username: ${{ secrets.USER }} source: "public/" destination: /opt/nginx/test.shockrah.xyz key: ${{ secrets.PRIVATE_KEY }} From 1ff1e57c7529147e9b6dea6a67613ad712e0ff69 Mon Sep 17 00:00:00 2001 From: shockrah Date: Sat, 28 Sep 2024 15:48:43 -0700 Subject: [PATCH 30/36] Testing change in pipeline --- .gitea/workflows/build-and-deploy.yml | 2 +- config.toml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/build-and-deploy.yml b/.gitea/workflows/build-and-deploy.yml index a2f92f6..5a89f7d 100644 --- a/.gitea/workflows/build-and-deploy.yml +++ b/.gitea/workflows/build-and-deploy.yml @@ -20,5 +20,5 @@ jobs: host: shockrah.xyz username: ${{ secrets.USER }} source: "public/" - destination: /opt/nginx/test.shockrah.xyz + destination: /opt/nginx/resume.shockrah.xyz key: ${{ secrets.PRIVATE_KEY }} diff --git a/config.toml b/config.toml index eb86afc..8052ef1 100644 --- a/config.toml +++ b/config.toml @@ -25,11 +25,11 @@ mastodon = "https://qoto.org/@shockrah" [[params.language.list]] type = "General Programming Languages" - language = "C/C++, Rust, Python, Bash, Javascript" + language = "C/C++, Rust, Python, Bash, Javascript, Terraform" [[params.language.list]] type = "Web Development" - language = "HTML, CSS, SASS, Jinja, Jquery, Vue, Flask" + language = "HTML, CSS, NodeJS, Vue" [[params.language.list]] type = "Soft skills" From f98932939b1611b536fe71230f6e74f0dd279f5e Mon Sep 17 00:00:00 2001 From: shockrah Date: Sat, 28 Sep 2024 15:50:56 -0700 Subject: [PATCH 31/36] Updating tagline --- config.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config.toml b/config.toml index 8052ef1..cdd3e27 100644 --- a/config.toml +++ b/config.toml @@ -9,14 +9,14 @@ unsafe= true # Actual site/content parameters [params] name = "Alejandro" -description = "Friendly Neighborhood Developer and Candy Maker" +description = "Friendly Neighborhood Developer and Soda Maker" title = "Hi I'm Alejandro" # Social medias linkedin = "https://www.linkedin.com/in/alejandro-santillana-foss/" -gitlab = "https://gitlab.com/shockrah" +gitlab = "https://git.shockrah.xyz/tempersama" twitch = "https://twitch.tv/shockrah" -mastodon = "https://qoto.org/@shockrah" +mastodon = "https://mastodon.social/@tempertv" # Skills or something idk From 5248daec9cfab24a0f8fddd8408fb4a02d077315 Mon Sep 17 00:00:00 2001 From: shockrah Date: Sat, 28 Sep 2024 15:53:42 -0700 Subject: [PATCH 32/36] Avoid setting dir times with 2.6 --- .gitea/workflows/build-and-deploy.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/build-and-deploy.yml b/.gitea/workflows/build-and-deploy.yml index 5a89f7d..ce4c110 100644 --- a/.gitea/workflows/build-and-deploy.yml +++ b/.gitea/workflows/build-and-deploy.yml @@ -15,10 +15,10 @@ jobs: - name: Build website content run: hugo && pwd && ls -R - name: Copy files with rsync - uses: tempersama/rsync-copy@2.5 + uses: tempersama/rsync-copy@2.6 with: host: shockrah.xyz username: ${{ secrets.USER }} source: "public/" - destination: /opt/nginx/resume.shockrah.xyz + destination: /opt/nginx/resume.shockrah.xyz/ key: ${{ secrets.PRIVATE_KEY }} From 8085658bc50d5361854f17bec5a3557f420b007b Mon Sep 17 00:00:00 2001 From: shockrah Date: Sat, 28 Sep 2024 16:00:24 -0700 Subject: [PATCH 33/36] Download lfs objects --- .gitea/workflows/build-and-deploy.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitea/workflows/build-and-deploy.yml b/.gitea/workflows/build-and-deploy.yml index ce4c110..89e430e 100644 --- a/.gitea/workflows/build-and-deploy.yml +++ b/.gitea/workflows/build-and-deploy.yml @@ -12,6 +12,8 @@ jobs: steps: - name: Checkout repository resources uses: actions/checkout@v4 + with: + lfs: true - name: Build website content run: hugo && pwd && ls -R - name: Copy files with rsync From 213c54f30041274e68dbb3074ee48ae74dd7292d Mon Sep 17 00:00:00 2001 From: shockrah Date: Sun, 29 Sep 2024 14:25:28 -0700 Subject: [PATCH 34/36] Replacing checkout action --- .gitea/workflows/build-and-deploy.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.gitea/workflows/build-and-deploy.yml b/.gitea/workflows/build-and-deploy.yml index 89e430e..622974d 100644 --- a/.gitea/workflows/build-and-deploy.yml +++ b/.gitea/workflows/build-and-deploy.yml @@ -10,10 +10,9 @@ jobs: container: image: shockrah/hugo steps: - - name: Checkout repository resources - uses: actions/checkout@v4 - with: - lfs: true + - run: git init + - run: git remote add origin https://git.shockrah.xyz/shockrah/resume.git + - run: git pull origin main - name: Build website content run: hugo && pwd && ls -R - name: Copy files with rsync From b71cadd3b868247dc7e0415a75372ecd23811239 Mon Sep 17 00:00:00 2001 From: shockrah Date: Sun, 29 Sep 2024 14:25:56 -0700 Subject: [PATCH 35/36] Replacing checkout action --- .gitea/workflows/build-and-deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build-and-deploy.yml b/.gitea/workflows/build-and-deploy.yml index 622974d..2b54479 100644 --- a/.gitea/workflows/build-and-deploy.yml +++ b/.gitea/workflows/build-and-deploy.yml @@ -12,7 +12,7 @@ jobs: steps: - run: git init - run: git remote add origin https://git.shockrah.xyz/shockrah/resume.git - - run: git pull origin main + - run: git pull origin master - name: Build website content run: hugo && pwd && ls -R - name: Copy files with rsync From 4abd6038c1aae6b33d06900eca95affe94bf44e6 Mon Sep 17 00:00:00 2001 From: shockrah Date: Mon, 30 Sep 2024 14:18:36 -0700 Subject: [PATCH 36/36] tiny readme update --- readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme.md b/readme.md index 3421c54..5ee6058 100644 --- a/readme.md +++ b/readme.md @@ -7,7 +7,7 @@ If you have any questions feel free to email me at `alejandros714@protonmail.com ## Building -Requires Hugo version: `0.89-extended` +Built with Hugo version: `0.135` Theme is built into the repo so no extra deps are required.