From 6affe178fd3455dd5371b3e7c53e4465545a1f5b Mon Sep 17 00:00:00 2001 From: maren Date: Sun, 17 Dec 2023 19:25:26 -0500 Subject: [PATCH 01/21] woodpecker init --- .gitignore | 1 + .woodpecker.yml | 9 +++++++++ 2 files changed, 10 insertions(+) create mode 100644 .woodpecker.yml diff --git a/.gitignore b/.gitignore index 73b36f8..e166de0 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ sorrel/** deploy-dir/** tool/** publish-test/** +todo.txt diff --git a/.woodpecker.yml b/.woodpecker.yml new file mode 100644 index 0000000..8263f7a --- /dev/null +++ b/.woodpecker.yml @@ -0,0 +1,9 @@ +steps: + build: + image: debian + commands: + - echo "This is the build step" + a-test-step: + image: debian + commands: + - echo "Testing.." -- 2.45.2 From f51281523a2bca07715f9c2c3b8d9a31bde59044 Mon Sep 17 00:00:00 2001 From: maren Date: Sun, 17 Dec 2023 19:58:16 -0500 Subject: [PATCH 02/21] branch exclusion? we'll know if it works when we merge to main lol --- .woodpecker.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.woodpecker.yml b/.woodpecker.yml index 8263f7a..c814d44 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -1,3 +1,6 @@ +when: + branch: + exclude: [ main ] steps: build: image: debian -- 2.45.2 From 2b37faf8324b6556096da175e6482e0499456b36 Mon Sep 17 00:00:00 2001 From: maren Date: Sun, 7 Jan 2024 17:49:32 -0500 Subject: [PATCH 03/21] ci --- .woodpecker.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index c814d44..f821f33 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -3,10 +3,10 @@ when: exclude: [ main ] steps: build: - image: debian + image: debian:bookworm commands: - echo "This is the build step" a-test-step: - image: debian + image: debian:bookworm commands: - echo "Testing.." -- 2.45.2 From 4b151e4792f3833f7d7a949557cde658237a0180 Mon Sep 17 00:00:00 2001 From: maren Date: Sun, 7 Jan 2024 18:11:53 -0500 Subject: [PATCH 04/21] see whats in the dir --- .woodpecker.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.woodpecker.yml b/.woodpecker.yml index f821f33..f4b5a68 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -6,6 +6,7 @@ steps: image: debian:bookworm commands: - echo "This is the build step" + - ls a-test-step: image: debian:bookworm commands: -- 2.45.2 From 5127070432166a60f18bd89b22043014574a69f4 Mon Sep 17 00:00:00 2001 From: maren Date: Sun, 7 Jan 2024 18:18:40 -0500 Subject: [PATCH 05/21] lazygit --- .woodpecker.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.woodpecker.yml b/.woodpecker.yml index f4b5a68..fc62b80 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -6,6 +6,9 @@ steps: image: debian:bookworm commands: - echo "This is the build step" + - rm -rf sorrel || true + - raco cross --target x86_64-linux exe sorrel.dev.rkt + - raco cross --target x86_64-linux dist sorrel sorrel.dev - ls a-test-step: image: debian:bookworm -- 2.45.2 From c56f9e0c5d419957ba32445c71eb1ea6e491b1ec Mon Sep 17 00:00:00 2001 From: maren Date: Sun, 7 Jan 2024 18:21:54 -0500 Subject: [PATCH 06/21] lazygit --- .woodpecker.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index fc62b80..d6ed3aa 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -5,11 +5,13 @@ steps: build: image: debian:bookworm commands: - - echo "This is the build step" - - rm -rf sorrel || true - - raco cross --target x86_64-linux exe sorrel.dev.rkt - - raco cross --target x86_64-linux dist sorrel sorrel.dev - - ls + - apt update + - rm -rf data/ + - rm -rf in-progress + - apt -yq install racket ca-certificates + - yes Y | raco pkg install --no-docs csv-reading + - raco exe sorrel.dev.rkt + - raco distribute dist sorrel.dev a-test-step: image: debian:bookworm commands: -- 2.45.2 From 440994beccb6b48a9a7825c9a16cc9842ba544ee Mon Sep 17 00:00:00 2001 From: maren Date: Sun, 7 Jan 2024 18:24:27 -0500 Subject: [PATCH 07/21] lazygit --- .woodpecker.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.woodpecker.yml b/.woodpecker.yml index d6ed3aa..aaf19ad 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -12,6 +12,7 @@ steps: - yes Y | raco pkg install --no-docs csv-reading - raco exe sorrel.dev.rkt - raco distribute dist sorrel.dev + - ls a-test-step: image: debian:bookworm commands: -- 2.45.2 From ff4ef29b0ca53297d422d35dd2455a49ac05c9a3 Mon Sep 17 00:00:00 2001 From: maren Date: Sun, 7 Jan 2024 19:40:23 -0500 Subject: [PATCH 08/21] lazygit --- .woodpecker.yml | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index aaf19ad..e3f8ef2 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -13,7 +13,17 @@ steps: - raco exe sorrel.dev.rkt - raco distribute dist sorrel.dev - ls - a-test-step: - image: debian:bookworm + deploy: + image: alpine:latest + secrets: [ deploy_ssh_key ] commands: - - echo "Testing.." + - apk add rsync openssh + - mkdir ~/.ssh + - printf '%s\n' "$${DEPLOY_SSH_KEY}" > ~/.ssh/deploy_ssh_key + - printf "Host turtle.hup.is\n\tIdentityFile ~/.ssh/deploy_ssh_key\n\tUserKnownHostsFile=/dev/null\n\tStrictHostKeyChecking=no\n" > ~/.ssh/config + - chmod -R u=rwX,go= ~/.ssh + # - rsync -rPvce ssh --chmod=ugo=rwX --no-times public/ www-fediparty@fediverse.party:www/ + - ssh deploy@turtle.hup.is "ls" + when: + # Only try to deploy if previous step is successful + status: success -- 2.45.2 From 97748d203f765461d89526108becaad9a628b536 Mon Sep 17 00:00:00 2001 From: maren Date: Sun, 7 Jan 2024 19:42:37 -0500 Subject: [PATCH 09/21] lazygit --- .woodpecker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index e3f8ef2..a16e53b 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -23,7 +23,7 @@ steps: - printf "Host turtle.hup.is\n\tIdentityFile ~/.ssh/deploy_ssh_key\n\tUserKnownHostsFile=/dev/null\n\tStrictHostKeyChecking=no\n" > ~/.ssh/config - chmod -R u=rwX,go= ~/.ssh # - rsync -rPvce ssh --chmod=ugo=rwX --no-times public/ www-fediparty@fediverse.party:www/ - - ssh deploy@turtle.hup.is "ls" + - ssh deploy@turtle.hup.is 'ls' when: # Only try to deploy if previous step is successful status: success -- 2.45.2 From 240f330f643f674ca9f5ca1972f5453e2f33d420 Mon Sep 17 00:00:00 2001 From: maren Date: Sun, 7 Jan 2024 19:46:36 -0500 Subject: [PATCH 10/21] lazygit --- .woodpecker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index a16e53b..5688b16 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -23,7 +23,7 @@ steps: - printf "Host turtle.hup.is\n\tIdentityFile ~/.ssh/deploy_ssh_key\n\tUserKnownHostsFile=/dev/null\n\tStrictHostKeyChecking=no\n" > ~/.ssh/config - chmod -R u=rwX,go= ~/.ssh # - rsync -rPvce ssh --chmod=ugo=rwX --no-times public/ www-fediparty@fediverse.party:www/ - - ssh deploy@turtle.hup.is 'ls' + - ssh deploy@turtle.hup.is 'touch wefoiuewofuwehf.txt' when: # Only try to deploy if previous step is successful status: success -- 2.45.2 From c235cabbbe84afe86ce7a242974e2e3b67059e66 Mon Sep 17 00:00:00 2001 From: maren Date: Sun, 7 Jan 2024 19:49:49 -0500 Subject: [PATCH 11/21] lazygit --- .woodpecker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index 5688b16..82d3e41 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -23,7 +23,7 @@ steps: - printf "Host turtle.hup.is\n\tIdentityFile ~/.ssh/deploy_ssh_key\n\tUserKnownHostsFile=/dev/null\n\tStrictHostKeyChecking=no\n" > ~/.ssh/config - chmod -R u=rwX,go= ~/.ssh # - rsync -rPvce ssh --chmod=ugo=rwX --no-times public/ www-fediparty@fediverse.party:www/ - - ssh deploy@turtle.hup.is 'touch wefoiuewofuwehf.txt' + - ssh deploy@turtle.hup.is 'ls -la' when: # Only try to deploy if previous step is successful status: success -- 2.45.2 From 13aea03426ccb90bae7dcf884df87efca075a775 Mon Sep 17 00:00:00 2001 From: maren Date: Sun, 7 Jan 2024 19:51:36 -0500 Subject: [PATCH 12/21] lazygit --- .woodpecker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index 82d3e41..a80d071 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -12,11 +12,11 @@ steps: - yes Y | raco pkg install --no-docs csv-reading - raco exe sorrel.dev.rkt - raco distribute dist sorrel.dev - - ls deploy: image: alpine:latest secrets: [ deploy_ssh_key ] commands: + - ls - apk add rsync openssh - mkdir ~/.ssh - printf '%s\n' "$${DEPLOY_SSH_KEY}" > ~/.ssh/deploy_ssh_key -- 2.45.2 From 93b396075bd40982e33bbbe5a9b6d9c38db1824f Mon Sep 17 00:00:00 2001 From: maren Date: Sun, 7 Jan 2024 20:15:39 -0500 Subject: [PATCH 13/21] lazygit --- .woodpecker.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index a80d071..00fb3d8 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -6,8 +6,8 @@ steps: image: debian:bookworm commands: - apt update - - rm -rf data/ - - rm -rf in-progress + # - rm -rf data/ + # - rm -rf in-progress - apt -yq install racket ca-certificates - yes Y | raco pkg install --no-docs csv-reading - raco exe sorrel.dev.rkt @@ -17,13 +17,13 @@ steps: secrets: [ deploy_ssh_key ] commands: - ls - - apk add rsync openssh + - apk add openssh - mkdir ~/.ssh - printf '%s\n' "$${DEPLOY_SSH_KEY}" > ~/.ssh/deploy_ssh_key - printf "Host turtle.hup.is\n\tIdentityFile ~/.ssh/deploy_ssh_key\n\tUserKnownHostsFile=/dev/null\n\tStrictHostKeyChecking=no\n" > ~/.ssh/config - chmod -R u=rwX,go= ~/.ssh # - rsync -rPvce ssh --chmod=ugo=rwX --no-times public/ www-fediparty@fediverse.party:www/ - - ssh deploy@turtle.hup.is 'ls -la' + - scp sorrel.dev deploy@turtle.hup.is:~/ when: # Only try to deploy if previous step is successful status: success -- 2.45.2 From 1da5a06026081f45b7311be9c3c706cae5b2eb4d Mon Sep 17 00:00:00 2001 From: maren Date: Sun, 7 Jan 2024 20:19:51 -0500 Subject: [PATCH 14/21] lazygit --- .woodpecker.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index 00fb3d8..d106153 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -23,7 +23,9 @@ steps: - printf "Host turtle.hup.is\n\tIdentityFile ~/.ssh/deploy_ssh_key\n\tUserKnownHostsFile=/dev/null\n\tStrictHostKeyChecking=no\n" > ~/.ssh/config - chmod -R u=rwX,go= ~/.ssh # - rsync -rPvce ssh --chmod=ugo=rwX --no-times public/ www-fediparty@fediverse.party:www/ - - scp sorrel.dev deploy@turtle.hup.is:~/ + - scp dist deploy@turtle.hup.is:~/ + - scp source deploy@turtle.hup.is:~/ + - scp static deploy@turtle.hup.is:~/ when: # Only try to deploy if previous step is successful status: success -- 2.45.2 From 0410e9460a06b806027296ec9cf6063a3cbc6cb0 Mon Sep 17 00:00:00 2001 From: maren Date: Sun, 7 Jan 2024 20:21:56 -0500 Subject: [PATCH 15/21] lazygit --- .woodpecker.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index d106153..c64e014 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -23,9 +23,9 @@ steps: - printf "Host turtle.hup.is\n\tIdentityFile ~/.ssh/deploy_ssh_key\n\tUserKnownHostsFile=/dev/null\n\tStrictHostKeyChecking=no\n" > ~/.ssh/config - chmod -R u=rwX,go= ~/.ssh # - rsync -rPvce ssh --chmod=ugo=rwX --no-times public/ www-fediparty@fediverse.party:www/ - - scp dist deploy@turtle.hup.is:~/ - - scp source deploy@turtle.hup.is:~/ - - scp static deploy@turtle.hup.is:~/ + - scp -r dist deploy@turtle.hup.is:~/ + - scp -r source deploy@turtle.hup.is:~/ + - scp -r static deploy@turtle.hup.is:~/ when: # Only try to deploy if previous step is successful status: success -- 2.45.2 From 988fa3ad51590a9c382a7f57da420c0d4b99910c Mon Sep 17 00:00:00 2001 From: maren Date: Sun, 7 Jan 2024 20:26:44 -0500 Subject: [PATCH 16/21] lazygit --- .woodpecker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index c64e014..fe8025e 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -3,7 +3,7 @@ when: exclude: [ main ] steps: build: - image: debian:bookworm + image: debian-slim:bookworm commands: - apt update # - rm -rf data/ -- 2.45.2 From 8b46222ecd6e300e17048dc7a183beaaf64f7bf9 Mon Sep 17 00:00:00 2001 From: maren Date: Sun, 7 Jan 2024 20:27:30 -0500 Subject: [PATCH 17/21] lazygit --- .woodpecker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index fe8025e..1e8a53b 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -3,7 +3,7 @@ when: exclude: [ main ] steps: build: - image: debian-slim:bookworm + image: debian:bookworm-slim commands: - apt update # - rm -rf data/ -- 2.45.2 From 3ced7b2bfcdc40556c4b51590e5e239b805cdbbb Mon Sep 17 00:00:00 2001 From: maren Date: Sun, 7 Jan 2024 20:43:30 -0500 Subject: [PATCH 18/21] lazygit --- .woodpecker.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index 1e8a53b..361f5fe 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -16,16 +16,17 @@ steps: image: alpine:latest secrets: [ deploy_ssh_key ] commands: - - ls - apk add openssh - mkdir ~/.ssh - printf '%s\n' "$${DEPLOY_SSH_KEY}" > ~/.ssh/deploy_ssh_key - printf "Host turtle.hup.is\n\tIdentityFile ~/.ssh/deploy_ssh_key\n\tUserKnownHostsFile=/dev/null\n\tStrictHostKeyChecking=no\n" > ~/.ssh/config - chmod -R u=rwX,go= ~/.ssh - # - rsync -rPvce ssh --chmod=ugo=rwX --no-times public/ www-fediparty@fediverse.party:www/ - - scp -r dist deploy@turtle.hup.is:~/ - - scp -r source deploy@turtle.hup.is:~/ - - scp -r static deploy@turtle.hup.is:~/ + - mkdir oxaliq + - mv dist oxaliq/. + - mv source oxaliq/. + - mv static oxaliq/. + - scp -r oxaliq deploy@turtle.hup.is:~/ + - ssh deploy@turtle.hup.is 'sudo rm /srv/oxaliq || true && sudo mv oxaliq /srv/. && sudo systemctl restart sorreldotdev.service' when: # Only try to deploy if previous step is successful status: success -- 2.45.2 From 64c7a5eea157520c0f77611d21ab84891fcba0a3 Mon Sep 17 00:00:00 2001 From: maren Date: Sun, 7 Jan 2024 20:45:14 -0500 Subject: [PATCH 19/21] lazygit --- .woodpecker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index 361f5fe..85141a2 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -26,7 +26,7 @@ steps: - mv source oxaliq/. - mv static oxaliq/. - scp -r oxaliq deploy@turtle.hup.is:~/ - - ssh deploy@turtle.hup.is 'sudo rm /srv/oxaliq || true && sudo mv oxaliq /srv/. && sudo systemctl restart sorreldotdev.service' + - ssh deploy@turtle.hup.is 'sudo rm -rf /srv/oxaliq || true && sudo mv oxaliq /srv/. && sudo systemctl restart sorreldotdev.service' when: # Only try to deploy if previous step is successful status: success -- 2.45.2 From f2f6a2c20b7bc126f7d6bdac3a770cdedb5b5323 Mon Sep 17 00:00:00 2001 From: maren Date: Sun, 7 Jan 2024 21:04:30 -0500 Subject: [PATCH 20/21] lazygit --- .woodpecker.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index 85141a2..c349a79 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -1,6 +1,7 @@ when: branch: - exclude: [ main ] + exclude: [ * ] + include: [ main ] steps: build: image: debian:bookworm-slim -- 2.45.2 From e9ce174208340182d8d60a02e63c38892739261f Mon Sep 17 00:00:00 2001 From: maren Date: Sun, 7 Jan 2024 21:10:15 -0500 Subject: [PATCH 21/21] lazygit --- .woodpecker.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index c349a79..7c2df29 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -1,8 +1,9 @@ when: branch: - exclude: [ * ] include: [ main ] + steps: + build: image: debian:bookworm-slim commands: @@ -13,6 +14,7 @@ steps: - yes Y | raco pkg install --no-docs csv-reading - raco exe sorrel.dev.rkt - raco distribute dist sorrel.dev + deploy: image: alpine:latest secrets: [ deploy_ssh_key ] -- 2.45.2