From c040167e99108789ae815c7c4cec28a30a4cab08 Mon Sep 17 00:00:00 2001 From: Neale Pickett Date: Fri, 27 Oct 2023 13:53:05 -0700 Subject: [PATCH 01/30] Add gitea workflow --- .gitea/workflows/build.yaml | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 .gitea/workflows/build.yaml diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml new file mode 100644 index 0000000..121f13c --- /dev/null +++ b/.gitea/workflows/build.yaml @@ -0,0 +1,13 @@ +name: Homepage +on: [push] +jobs: + publish: + runs-on: docker + container: klakegg/hugo:ext + steps: + - name: Check out source + run: git clone $GITHUB_SERVER_URL/$GITHUB_REPOSITORY . + - name: Build + run: hugo build + - name: Publish + run: rsync --delete -vax ./public/ neale@melville.woozle.org:/srv/www/woozle.org/ From 371d19473a8c641c95ebec2d4e2f36fefb06636e Mon Sep 17 00:00:00 2001 From: neale Date: Fri, 27 Oct 2023 14:56:06 -0600 Subject: [PATCH 02/30] Update .gitea/workflows/build.yaml --- .gitea/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 121f13c..3a5e800 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -2,7 +2,7 @@ name: Homepage on: [push] jobs: publish: - runs-on: docker + runs-on: ubuntu:docker container: klakegg/hugo:ext steps: - name: Check out source From 308ddc7a61d2ec55b6dfd97f41413d7ef109358c Mon Sep 17 00:00:00 2001 From: neale Date: Fri, 27 Oct 2023 14:58:09 -0600 Subject: [PATCH 03/30] Update .gitea/workflows/build.yaml --- .gitea/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 3a5e800..5aaf761 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -2,7 +2,7 @@ name: Homepage on: [push] jobs: publish: - runs-on: ubuntu:docker + runs-on: ubuntu-latest:docker container: klakegg/hugo:ext steps: - name: Check out source From f447fcf75bacdba975051391b0bd52a5a8cc21e8 Mon Sep 17 00:00:00 2001 From: neale Date: Fri, 27 Oct 2023 14:58:27 -0600 Subject: [PATCH 04/30] Update .gitea/workflows/build.yaml --- .gitea/workflows/build.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 5aaf761..0f2b872 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -2,7 +2,6 @@ name: Homepage on: [push] jobs: publish: - runs-on: ubuntu-latest:docker container: klakegg/hugo:ext steps: - name: Check out source From 3ff0ff76268183e425bb8696d42241d99852c833 Mon Sep 17 00:00:00 2001 From: neale Date: Fri, 27 Oct 2023 15:04:19 -0600 Subject: [PATCH 05/30] Update .gitea/workflows/build.yaml --- .gitea/workflows/build.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 0f2b872..c434fb7 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -1,12 +1,15 @@ name: Homepage on: [push] jobs: - publish: + build: container: klakegg/hugo:ext steps: - name: Check out source run: git clone $GITHUB_SERVER_URL/$GITHUB_REPOSITORY . - name: Build run: hugo build + publish: + container: rsync/rsync + - run: find - name: Publish run: rsync --delete -vax ./public/ neale@melville.woozle.org:/srv/www/woozle.org/ From 68d2d3494735a1b8d268f9efca00dd10863ef914 Mon Sep 17 00:00:00 2001 From: neale Date: Fri, 27 Oct 2023 15:24:34 -0600 Subject: [PATCH 06/30] Update .gitea/workflows/build.yaml --- .gitea/workflows/build.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index c434fb7..1b64819 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -10,6 +10,7 @@ jobs: run: hugo build publish: container: rsync/rsync + steps: - run: find - name: Publish run: rsync --delete -vax ./public/ neale@melville.woozle.org:/srv/www/woozle.org/ From 9a4a0aecdce530573738295845550b7b21684820 Mon Sep 17 00:00:00 2001 From: neale Date: Fri, 27 Oct 2023 20:33:11 -0600 Subject: [PATCH 07/30] Update .gitea/workflows/build.yaml --- .gitea/workflows/build.yaml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 1b64819..4942d59 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -2,15 +2,10 @@ name: Homepage on: [push] jobs: build: - container: klakegg/hugo:ext steps: - name: Check out source run: git clone $GITHUB_SERVER_URL/$GITHUB_REPOSITORY . - name: Build run: hugo build - publish: - container: rsync/rsync - steps: - - run: find - name: Publish run: rsync --delete -vax ./public/ neale@melville.woozle.org:/srv/www/woozle.org/ From 3c560f3903d448470e4c47e343d87e15d52ef3f7 Mon Sep 17 00:00:00 2001 From: neale Date: Fri, 27 Oct 2023 20:52:19 -0600 Subject: [PATCH 08/30] Update .gitea/workflows/build.yaml --- .gitea/workflows/build.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 4942d59..54d1ca1 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -2,6 +2,8 @@ name: Homepage on: [push] jobs: build: + runs-on: + - host steps: - name: Check out source run: git clone $GITHUB_SERVER_URL/$GITHUB_REPOSITORY . From d2129565919b11e82e310285108d7bfd9dbd5c45 Mon Sep 17 00:00:00 2001 From: neale Date: Fri, 27 Oct 2023 20:53:16 -0600 Subject: [PATCH 09/30] Update .gitea/workflows/build.yaml --- .gitea/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 54d1ca1..d50f540 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -3,7 +3,7 @@ on: [push] jobs: build: runs-on: - - host + - hugo steps: - name: Check out source run: git clone $GITHUB_SERVER_URL/$GITHUB_REPOSITORY . From 3f4a80ea8837ab84c46ef93c02d9793cc721c240 Mon Sep 17 00:00:00 2001 From: neale Date: Fri, 27 Oct 2023 20:56:18 -0600 Subject: [PATCH 10/30] Update .gitea/workflows/build.yaml --- .gitea/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index d50f540..10e49e5 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -8,6 +8,6 @@ jobs: - name: Check out source run: git clone $GITHUB_SERVER_URL/$GITHUB_REPOSITORY . - name: Build - run: hugo build + run: hugo - name: Publish run: rsync --delete -vax ./public/ neale@melville.woozle.org:/srv/www/woozle.org/ From 98e61af61fb416095bf686c61ce9c1fe8ee93ac5 Mon Sep 17 00:00:00 2001 From: Neale Pickett Date: Fri, 27 Oct 2023 20:00:59 -0700 Subject: [PATCH 11/30] CI/CD --- .gitea/workflows/build.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 10e49e5..251262c 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -9,5 +9,7 @@ jobs: run: git clone $GITHUB_SERVER_URL/$GITHUB_REPOSITORY . - name: Build run: hugo + - name: Set up SSH + mkdir $HOME/.ssh && cp .gitea/workflows/known_hosts $HOME/.ssh - name: Publish run: rsync --delete -vax ./public/ neale@melville.woozle.org:/srv/www/woozle.org/ From 88621b5746b4dae0e316ac5a96390cf697a1d65a Mon Sep 17 00:00:00 2001 From: Neale Pickett Date: Fri, 27 Oct 2023 20:01:46 -0700 Subject: [PATCH 12/30] CI/CD --- .gitea/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 251262c..5310009 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -10,6 +10,6 @@ jobs: - name: Build run: hugo - name: Set up SSH - mkdir $HOME/.ssh && cp .gitea/workflows/known_hosts $HOME/.ssh + run: mkdir $HOME/.ssh && cp .gitea/workflows/known_hosts $HOME/.ssh - name: Publish run: rsync --delete -vax ./public/ neale@melville.woozle.org:/srv/www/woozle.org/ From 3f737f81cab57fbcce784cf240bff5ad57022240 Mon Sep 17 00:00:00 2001 From: Neale Pickett Date: Fri, 27 Oct 2023 20:02:16 -0700 Subject: [PATCH 13/30] CI/CD --- .gitea/workflows/known_hosts | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .gitea/workflows/known_hosts diff --git a/.gitea/workflows/known_hosts b/.gitea/workflows/known_hosts new file mode 100644 index 0000000..94efe99 --- /dev/null +++ b/.gitea/workflows/known_hosts @@ -0,0 +1,3 @@ +melville.woozle.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC6fMdw0m8wvh5+9IUcNgjxk0TgjoTT1anESnsYWIcnmS8l7PzkB/WfCEZEU0QzKvKXSp37jd30iR5U9jM7zTjYrjCJZvK0dxShC9iIgR5akAThXvlH0KkHVAvhmQda6nvMWQugp359Usp4zH90/J7G//+3HEQ9zfXW+p29bwBOdyDHfjDSIz95ysy8ivwMFKuPgAsNK4FDfBsGVHCM5xu5bn0dSaHeqGn7bneY00zwQqQot6rOw1Pao2tEY04Vu4KC1VKVWKU38dNBEFTOQBxYhiVMsxY3CIwDbEQLA5gjRnYog2KvsDP9XK4W2k1Yc9PvwoinqzcgmDS7isQ8HAoZiY06CChg3hHYXRre+TcO/UrjhzrWbxdCo7XFKBiC74ZU/+t2IkBmmHEnaTpmaLazxZD75wUH9rrWwgPVFEWNp41nj0VfQfR032MwJ2iNbvkCW/2kUWe++r56TlYQjxL8FVICVBbt6pZprMbEkQm3/iPR6ibfNNa620Kz3QRUsxM= +melville.woozle.org ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBE1D4QQxjnNgmI7wteSAnAqArKQ6UTnTKmTitnU40ISizAK1j8OqXxEv0hbssNrTVyqlmLUoIeRuHd5bHGC8dEE= +melville.woozle.org ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEQKIumG2Wl3papG4lcIB9+ZEe76uMbfpP+XSlUBjR0E From 6359c3fcb080cc308a57bf004e4ab7156ae89e6b Mon Sep 17 00:00:00 2001 From: Neale Pickett Date: Fri, 27 Oct 2023 20:02:54 -0700 Subject: [PATCH 14/30] CI/CD --- .gitea/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 5310009..53e094d 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -10,6 +10,6 @@ jobs: - name: Build run: hugo - name: Set up SSH - run: mkdir $HOME/.ssh && cp .gitea/workflows/known_hosts $HOME/.ssh + run: mkdir -p $HOME/.ssh && cp .gitea/workflows/known_hosts $HOME/.ssh - name: Publish run: rsync --delete -vax ./public/ neale@melville.woozle.org:/srv/www/woozle.org/ From a56973970367a1ab40b59b4b91b2fa47381c766f Mon Sep 17 00:00:00 2001 From: Neale Pickett Date: Fri, 27 Oct 2023 20:19:56 -0700 Subject: [PATCH 15/30] CI/CD --- .gitea/workflows/build.yaml | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 53e094d..c7107e0 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -5,11 +5,9 @@ jobs: runs-on: - hugo steps: - - name: Check out source - run: git clone $GITHUB_SERVER_URL/$GITHUB_REPOSITORY . - - name: Build - run: hugo - - name: Set up SSH - run: mkdir -p $HOME/.ssh && cp .gitea/workflows/known_hosts $HOME/.ssh - - name: Publish - run: rsync --delete -vax ./public/ neale@melville.woozle.org:/srv/www/woozle.org/ + - run: git clone $GITHUB_SERVER_URL/$GITHUB_REPOSITORY . + - run: hugo + - run: mkdir -p $HOME/.ssh + - run: cp .gitea/workflows/known_hosts $HOME/.ssh + - run: umask 077; echo ${{ secrets.SSH_PUBLISH_PRIVATE_KEY }} > $HOME/id_rsa + - run: rsync --delete -vax ./public/ neale@melville.woozle.org:/srv/www/woozle.org/ From d7ae9684cfffb8b5736c6c9ea0ff38780a858d71 Mon Sep 17 00:00:00 2001 From: Neale Pickett Date: Fri, 27 Oct 2023 20:25:47 -0700 Subject: [PATCH 16/30] CI/CD --- .gitea/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index c7107e0..13cd0f4 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -9,5 +9,5 @@ jobs: - run: hugo - run: mkdir -p $HOME/.ssh - run: cp .gitea/workflows/known_hosts $HOME/.ssh - - run: umask 077; echo ${{ secrets.SSH_PUBLISH_PRIVATE_KEY }} > $HOME/id_rsa + - run: umask 077; echo ${{ secrets.SSH_PUBLISH_PRIVATE_KEY_BASE64 }} | base64 -d > $HOME/id_rsa - run: rsync --delete -vax ./public/ neale@melville.woozle.org:/srv/www/woozle.org/ From 71e5947d0d16d23c62605f95c586ca30c09759a0 Mon Sep 17 00:00:00 2001 From: Neale Pickett Date: Fri, 27 Oct 2023 20:33:32 -0700 Subject: [PATCH 17/30] CI/CD --- .gitea/workflows/build.yaml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 13cd0f4..210464e 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -7,7 +7,11 @@ jobs: steps: - run: git clone $GITHUB_SERVER_URL/$GITHUB_REPOSITORY . - run: hugo - - run: mkdir -p $HOME/.ssh - - run: cp .gitea/workflows/known_hosts $HOME/.ssh - - run: umask 077; echo ${{ secrets.SSH_PUBLISH_PRIVATE_KEY_BASE64 }} | base64 -d > $HOME/id_rsa - - run: rsync --delete -vax ./public/ neale@melville.woozle.org:/srv/www/woozle.org/ + - name: set up SSH + run: | + mkdir -p $HOME/.ssh + cp .gitea/workflows/known_hosts $HOME/.ssh + umask 077; echo ${{ secrets.SSH_PUBLISH_PRIVATE_KEY_BASE64 }} | base64 -d > $HOME/id_rsa + - name: rsync + run: | + ssh-agent rsync --delete -vax ./public/ neale@melville.woozle.org:/srv/www/woozle.org/ From d1f80b61daef28651e2711a244cdcf8d2faf82c8 Mon Sep 17 00:00:00 2001 From: Neale Pickett Date: Fri, 27 Oct 2023 20:36:48 -0700 Subject: [PATCH 18/30] CI/CD --- .gitea/workflows/build.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 210464e..e2b58c4 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -11,7 +11,10 @@ jobs: run: | mkdir -p $HOME/.ssh cp .gitea/workflows/known_hosts $HOME/.ssh - umask 077; echo ${{ secrets.SSH_PUBLISH_PRIVATE_KEY_BASE64 }} | base64 -d > $HOME/id_rsa + umask 077; cat > $HOME/.ssh/id_rsa < Date: Fri, 27 Oct 2023 21:05:48 -0700 Subject: [PATCH 19/30] CI/CD --- .gitea/workflows/build.yaml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index e2b58c4..2b9acc9 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -7,7 +7,7 @@ jobs: steps: - run: git clone $GITHUB_SERVER_URL/$GITHUB_REPOSITORY . - run: hugo - - name: set up SSH + - name: Set up SSH run: | mkdir -p $HOME/.ssh cp .gitea/workflows/known_hosts $HOME/.ssh @@ -15,6 +15,10 @@ jobs: ${{ secrets.SSH_PUBLISH_PRIVATE_KEY }} EOD md5sum $HOME/.ssh/id_rsa + nevermind: + runs-on: + - hugo + steps: - name: rsync run: | - ssh-agent rsync --delete -vax ./public/ neale@melville.woozle.org:/srv/www/woozle.org/ + echo ssh-agent rsync --delete -vax ./public/ neale@melville.woozle.org:/srv/www/woozle.org/ From b5b4fb34deb069f18089fbeb78927ee6c7f607c6 Mon Sep 17 00:00:00 2001 From: Neale Pickett Date: Fri, 27 Oct 2023 21:08:21 -0700 Subject: [PATCH 20/30] CI/CD --- .gitea/workflows/build.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 2b9acc9..dcb502e 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -14,6 +14,7 @@ jobs: umask 077; cat > $HOME/.ssh/id_rsa < Date: Fri, 27 Oct 2023 21:10:28 -0700 Subject: [PATCH 21/30] CI/CD --- .gitea/workflows/build.yaml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index dcb502e..95c3720 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -4,6 +4,7 @@ jobs: build: runs-on: - hugo + timeout-minutes: 1 steps: - run: git clone $GITHUB_SERVER_URL/$GITHUB_REPOSITORY . - run: hugo @@ -16,10 +17,5 @@ jobs: EOD ls -l $HOME/.ssh md5sum $HOME/.ssh/id_rsa - nevermind: - runs-on: - - hugo - steps: - - name: rsync - run: | + - run: | echo ssh-agent rsync --delete -vax ./public/ neale@melville.woozle.org:/srv/www/woozle.org/ From c08d013061a30e566d358706d1db3b674400b1f3 Mon Sep 17 00:00:00 2001 From: Neale Pickett Date: Fri, 27 Oct 2023 21:13:14 -0700 Subject: [PATCH 22/30] CI/CD --- .gitea/workflows/build.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 95c3720..bf94bee 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -18,4 +18,6 @@ jobs: ls -l $HOME/.ssh md5sum $HOME/.ssh/id_rsa - run: | + eval $(ssh-agent) + ssh-add -l echo ssh-agent rsync --delete -vax ./public/ neale@melville.woozle.org:/srv/www/woozle.org/ From f644f36bfcfa2768ea6a539fe560266663114026 Mon Sep 17 00:00:00 2001 From: Neale Pickett Date: Fri, 27 Oct 2023 21:15:42 -0700 Subject: [PATCH 23/30] CI/CD --- .gitea/workflows/build.yaml | 4 +++- .gitea/workflows/known_hosts | 3 --- 2 files changed, 3 insertions(+), 4 deletions(-) delete mode 100644 .gitea/workflows/known_hosts diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index bf94bee..40d41d3 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -11,7 +11,9 @@ jobs: - name: Set up SSH run: | mkdir -p $HOME/.ssh - cp .gitea/workflows/known_hosts $HOME/.ssh + cat > $HOME/.ssh/known_hosts < $HOME/.ssh/id_rsa < Date: Fri, 27 Oct 2023 21:16:22 -0700 Subject: [PATCH 24/30] CI/CD --- .gitea/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 40d41d3..3c28334 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -12,7 +12,7 @@ jobs: run: | mkdir -p $HOME/.ssh cat > $HOME/.ssh/known_hosts < $HOME/.ssh/id_rsa < Date: Fri, 27 Oct 2023 21:19:23 -0700 Subject: [PATCH 25/30] CI/CD --- .gitea/workflows/build.yaml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 3c28334..f595770 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -18,8 +18,9 @@ jobs: ${{ secrets.SSH_PUBLISH_PRIVATE_KEY }} EOD ls -l $HOME/.ssh - md5sum $HOME/.ssh/id_rsa - - run: | + md5sum $HOME/.ssh/* + - name: Install built site + run: | eval $(ssh-agent) - ssh-add -l + ssh-add echo ssh-agent rsync --delete -vax ./public/ neale@melville.woozle.org:/srv/www/woozle.org/ From 6236470b1488f19e5de2efcec700d5605a640bb3 Mon Sep 17 00:00:00 2001 From: Neale Pickett Date: Fri, 27 Oct 2023 21:20:18 -0700 Subject: [PATCH 26/30] CI/CD --- .gitea/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index f595770..6d07416 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -23,4 +23,4 @@ jobs: run: | eval $(ssh-agent) ssh-add - echo ssh-agent rsync --delete -vax ./public/ neale@melville.woozle.org:/srv/www/woozle.org/ + rsync --delete -vax ./public/ neale@melville.woozle.org:/srv/www/woozle.org/ From 7f2ef4cd2dc9e399f3a1662448f5289fac8833ae Mon Sep 17 00:00:00 2001 From: Neale Pickett Date: Fri, 27 Oct 2023 21:22:10 -0700 Subject: [PATCH 27/30] CI/CD --- .gitea/workflows/build.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 6d07416..d55982e 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -6,8 +6,6 @@ jobs: - hugo timeout-minutes: 1 steps: - - run: git clone $GITHUB_SERVER_URL/$GITHUB_REPOSITORY . - - run: hugo - name: Set up SSH run: | mkdir -p $HOME/.ssh @@ -19,6 +17,9 @@ jobs: EOD ls -l $HOME/.ssh md5sum $HOME/.ssh/* + - name: Clone git repository + run: git clone $GITHUB_SERVER_URL/$GITHUB_REPOSITORY . + - run: hugo - name: Install built site run: | eval $(ssh-agent) From 5d3df92c06f75fdd24cc2294bb2ea82f72283e13 Mon Sep 17 00:00:00 2001 From: Neale Pickett Date: Fri, 27 Oct 2023 21:39:32 -0700 Subject: [PATCH 28/30] CI/CD --- .gitea/workflows/build.yaml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index d55982e..729e382 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -1,7 +1,7 @@ name: Homepage on: [push] jobs: - build: + publish: runs-on: - hugo timeout-minutes: 1 @@ -15,10 +15,8 @@ jobs: umask 077; cat > $HOME/.ssh/id_rsa < Date: Sat, 28 Oct 2023 10:56:31 -0700 Subject: [PATCH 29/30] Your first train trip --- .../2023/10-28-your-first-train-trip/index.md | 103 ++++++++++++++++++ publish.sh | 10 -- 2 files changed, 103 insertions(+), 10 deletions(-) create mode 100644 content/blog/2023/10-28-your-first-train-trip/index.md delete mode 100755 publish.sh diff --git a/content/blog/2023/10-28-your-first-train-trip/index.md b/content/blog/2023/10-28-your-first-train-trip/index.md new file mode 100644 index 0000000..7e00796 --- /dev/null +++ b/content/blog/2023/10-28-your-first-train-trip/index.md @@ -0,0 +1,103 @@ +--- +title: Your First Train Trip +date: 2023-10-28 +tags: + - trains +--- + +People at work are more interested than I thought in my taking the train. +One of them might eventually decide to try it. +Here's my advice to you! + +Start Small +----------- + +You don't need to immediately try a 3-leg trip. +The first trip I took by train was Lamy to Kansas City: +you get on the train around 13:00, have dinner, +go to sleep, +then at about 07:00 you've arrived. +I recommend starting with a short trip like this, +so you can acclimate to everything. +Sleeping on a train, for instance, +is probably not something most people can do right away. + +If you're in Richland, you might try a trip to Portland for the weekend. +That starts at about 06:45, +and arrives around lunchtime. + + +Plan For Delays +------------- + +Delays happen with any type of travel. +On trains, delays tend to be hours long. +On my multi-leg trips, they're frequently 24 hours. + +Mentally prepare yourself for delays. +Pack "buffer days" into your trip: +whole days where you don't absolutely need to be anywhere. +Put these on the tail end of each travel day: +when you arrive at the destination, +and when you get home. +That way, if you have a big delay, +you're just using your buffer. + + +Pack Food +-------- + +You can buy food on the train, +but it's not cheap. +It's meant to be an upscale dining experience, +and the prices reflect it: +$25 breakfast, $35 lunch, $45 dinner in October 2023. +And that's before you pay the tip. + +There is a café car, +but the food there is mostly things that can go in a microwave. +It does have beer and wine, which is nice: +you're not allowed to bring your own on the train. +But you can bring your own food. +Plan it like a picnic for your first short trip! + + +Pack Light +--------- + +Once you've accepted that delays are going to happen, +new opportunities open up for unplanned exploration. +I particularly relish getting stuck in Portland or Chicago: +both have big ol' downtown areas full of interesting things. + +If you're delayed overnight, +Amtrak will put you up in a hotel. +But you're not required to rush to the hotel immediately and watch TV! +You can get there whenever you like, +and do some touring. + +If you have a big suitcase to drag around, +exploration before you get to the hotel is not a viable option. +And you may find the hotel isn't anywhere interesting. + +I love my REI Ruckpack 28 for travel. +It's got enough room for 3 changes of clothes (I do laundry every night), +my laptop, and all my other stuff. +I've got another blog entry that goes in more depth on +[what to take](/blog/2023/09-25-business-travel-on-amtrak/). + + +Chill Out +------- + +Trains in the US are slow. +You're going to have to just chill out and accept this. +Worrying about whether you'll make it somewhere on time is a good indication that you should be on an airplane. + +I mean, airplanes get delayed a lot, too. +But at least you won't be upset that they move too slowly? +I'm not sure. I'm a pretty chill traveler when I go by air, too. + +But the train is going to force you to chill out. +If you can accept this, +you'll have a nice time! diff --git a/publish.sh b/publish.sh deleted file mode 100755 index 58e424b..0000000 --- a/publish.sh +++ /dev/null @@ -1,10 +0,0 @@ -#! /bin/sh - -rm -rf $(dirname $0)/public -docker run \ - --rm -i \ - -v $(realpath $(dirname $0)):/src \ - -u $(id -u):$(id -g) \ - klakegg/hugo:ext build - -rsync --delete -vax $(dirname $0)/public/ melville.woozle.org:/srv/www/woozle.org/ From fb0422a308f0562b79fffb544d3d305a9e663429 Mon Sep 17 00:00:00 2001 From: Neale Pickett Date: Sat, 28 Oct 2023 12:49:06 -0700 Subject: [PATCH 30/30] Some edits --- .../2023/10-28-your-first-train-trip/index.md | 27 ++++++++----------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/content/blog/2023/10-28-your-first-train-trip/index.md b/content/blog/2023/10-28-your-first-train-trip/index.md index 7e00796..e16a734 100644 --- a/content/blog/2023/10-28-your-first-train-trip/index.md +++ b/content/blog/2023/10-28-your-first-train-trip/index.md @@ -5,10 +5,12 @@ tags: - trains --- -People at work are more interested than I thought in my taking the train. +To my surprise, +people at work are considering taking the train places. One of them might eventually decide to try it. Here's my advice to you! + Start Small ----------- @@ -43,11 +45,18 @@ and when you get home. That way, if you have a big delay, you're just using your buffer. +If you're delayed overnight, +Amtrak will put you up in a hotel. +But you're not required to rush to the hotel immediately and watch TV! +You can get there whenever you like, +and do some touring. +This is an awesome perk of train travel! + Pack Food -------- -You can buy food on the train, +You can buy meals on the train, but it's not cheap. It's meant to be an upscale dining experience, and the prices reflect it: @@ -70,12 +79,6 @@ new opportunities open up for unplanned exploration. I particularly relish getting stuck in Portland or Chicago: both have big ol' downtown areas full of interesting things. -If you're delayed overnight, -Amtrak will put you up in a hotel. -But you're not required to rush to the hotel immediately and watch TV! -You can get there whenever you like, -and do some touring. - If you have a big suitcase to drag around, exploration before you get to the hotel is not a viable option. And you may find the hotel isn't anywhere interesting. @@ -91,13 +94,5 @@ Chill Out ------- Trains in the US are slow. -You're going to have to just chill out and accept this. -Worrying about whether you'll make it somewhere on time is a good indication that you should be on an airplane. - -I mean, airplanes get delayed a lot, too. -But at least you won't be upset that they move too slowly? -I'm not sure. I'm a pretty chill traveler when I go by air, too. - -But the train is going to force you to chill out. If you can accept this, you'll have a nice time!