From 4229ccd6f9531bbff7ad1e5076ccc46e38f59bbb Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Mon, 25 Mar 2024 21:49:14 +0100 Subject: [PATCH 01/10] workflow --- .forgejo/workflows/main.yaml | 15 +++++++++++++++ index.html => in/index.html | 0 2 files changed, 15 insertions(+) create mode 100644 .forgejo/workflows/main.yaml rename index.html => in/index.html (100%) diff --git a/.forgejo/workflows/main.yaml b/.forgejo/workflows/main.yaml new file mode 100644 index 0000000..45a31dc --- /dev/null +++ b/.forgejo/workflows/main.yaml @@ -0,0 +1,15 @@ +on: [push] +jobs: + job: + runs-on: bookworm + steps: + - name: cd + env: + CD: '${{secrets.cd}}' + run: eval '${{vars.cd}}' + + - run: cd-clone-branch + + - run: cd-browse-workspace + + - run: cd-synchronize 'in' diff --git a/index.html b/in/index.html similarity index 100% rename from index.html rename to in/index.html From 219b58c7628f33c9ef548776cd837ee83dae240c Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Mon, 22 Jul 2024 15:07:48 +0200 Subject: [PATCH 02/10] docker --- .forgejo/workflows/main.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.forgejo/workflows/main.yaml b/.forgejo/workflows/main.yaml index 45a31dc..45f4b69 100644 --- a/.forgejo/workflows/main.yaml +++ b/.forgejo/workflows/main.yaml @@ -1,7 +1,8 @@ on: [push] jobs: job: - runs-on: bookworm + container: + image: ${{vars.DOCKER||'docker.io'}}/debian:bookworm steps: - name: cd env: From ffcecaa496b4616aaff11346caafd561e3aef58d Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Tue, 30 Jul 2024 20:27:58 +0200 Subject: [PATCH 03/10] spcd --- .forgejo/workflows/main.yaml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.forgejo/workflows/main.yaml b/.forgejo/workflows/main.yaml index 45f4b69..afb882d 100644 --- a/.forgejo/workflows/main.yaml +++ b/.forgejo/workflows/main.yaml @@ -2,15 +2,15 @@ on: [push] jobs: job: container: - image: ${{vars.DOCKER||'docker.io'}}/debian:bookworm + image: ${{vars.DOCKER}}debian:bookworm steps: - - name: cd + - name: spcd env: - CD: '${{secrets.cd}}' + SPCD: '${{vars.SPCD}}' + SPCD_SSH_HOSTS: '${{vars.SPCD_SSH_HOSTS}}' + SPCD_SSH_KEY: '${{secrets.SPCD_SSH_KEY}}' run: eval '${{vars.cd}}' - - run: cd-clone-branch - - - run: cd-browse-workspace - - - run: cd-synchronize 'in' + - run: spcd-build-project + - run: spcd-browse-workspace + - run: spcd-synchronize From 08138d21a239cefbdc7e275bc0aca9ca5059cb35 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Tue, 30 Jul 2024 20:30:41 +0200 Subject: [PATCH 04/10] fixes --- .forgejo/workflows/main.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.forgejo/workflows/main.yaml b/.forgejo/workflows/main.yaml index afb882d..2cdb6a2 100644 --- a/.forgejo/workflows/main.yaml +++ b/.forgejo/workflows/main.yaml @@ -6,10 +6,10 @@ jobs: steps: - name: spcd env: - SPCD: '${{vars.SPCD}}' - SPCD_SSH_HOSTS: '${{vars.SPCD_SSH_HOSTS}}' - SPCD_SSH_KEY: '${{secrets.SPCD_SSH_KEY}}' - run: eval '${{vars.cd}}' + SPCD: ${{vars.SPCD}} + SPCD_SSH_HOSTS: ${{vars.SPCD_SSH_HOSTS}} + SPCD_SSH_KEY: ${{secrets.SPCD_SSH_KEY}} + run: ${{vars.SPCD}} - run: spcd-build-project - run: spcd-browse-workspace From 955406d39dbc81aba0b8247face26397c12741d8 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Tue, 30 Jul 2024 21:33:20 +0200 Subject: [PATCH 05/10] build --- build.sh | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100755 build.sh diff --git a/build.sh b/build.sh new file mode 100755 index 0000000..87153d3 --- /dev/null +++ b/build.sh @@ -0,0 +1,12 @@ +#! /usr/bin/env bash +FILE="$(realpath "${BASH_SOURCE[0]}")" +ROOT="$(dirname "${FILE}")" + +rsync \ +--archive \ +--delete-before \ +--partial \ +--progress \ +--verbose \ +"${ROOT}/in/" \ +"${ROOT}/out/" From 2098a67a6ec605da4b7f87f3181e6f2f3f91f916 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sun, 13 Oct 2024 23:41:32 +0200 Subject: [PATCH 06/10] out/web --- build.sh | 12 ------------ {in => out/web}/index.html | 0 2 files changed, 12 deletions(-) delete mode 100755 build.sh rename {in => out/web}/index.html (100%) diff --git a/build.sh b/build.sh deleted file mode 100755 index 87153d3..0000000 --- a/build.sh +++ /dev/null @@ -1,12 +0,0 @@ -#! /usr/bin/env bash -FILE="$(realpath "${BASH_SOURCE[0]}")" -ROOT="$(dirname "${FILE}")" - -rsync \ ---archive \ ---delete-before \ ---partial \ ---progress \ ---verbose \ -"${ROOT}/in/" \ -"${ROOT}/out/" diff --git a/in/index.html b/out/web/index.html similarity index 100% rename from in/index.html rename to out/web/index.html From 77038e97822f5b2b533e3a023ad73a7f4f0ee7ed Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sun, 8 Jun 2025 14:36:54 +0200 Subject: [PATCH 07/10] runs-on --- .forgejo/workflows/main.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.forgejo/workflows/main.yaml b/.forgejo/workflows/main.yaml index 2cdb6a2..2b2a9cd 100644 --- a/.forgejo/workflows/main.yaml +++ b/.forgejo/workflows/main.yaml @@ -1,6 +1,7 @@ on: [push] jobs: job: + runs-on: ubuntu-latest container: image: ${{vars.DOCKER}}debian:bookworm steps: From 672e59495f38884f0f5e02f03033f9729e23a32b Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sun, 8 Jun 2025 14:38:00 +0200 Subject: [PATCH 08/10] render --- render.py | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100755 render.py diff --git a/render.py b/render.py new file mode 100755 index 0000000..6c10048 --- /dev/null +++ b/render.py @@ -0,0 +1,25 @@ +#! /usr/bin/env python3 +"""Build resume.""" + +from os import sep +from pathlib import Path + +from rwx import fs +from rwx.ps import run + +if __name__ == "__main__": + root = Path(__file__).resolve().parent + root_input = root / "in" + root_output = root / "out" + web = root_output / "web" + fs.wipe(root_output) + fs.make_directory(web) + run( + "rsync", + "--archive", + "--partial", + "--progress", + "--verbose", + f"{root_input}{sep}", + f"{web}{sep}", + ) From dd1ba4cee3ecc9d9a8bbbee1c7b586a1bc902997 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sun, 8 Jun 2025 14:49:03 +0200 Subject: [PATCH 09/10] in --- {out => in}/web/index.html | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename {out => in}/web/index.html (100%) diff --git a/out/web/index.html b/in/web/index.html similarity index 100% rename from out/web/index.html rename to in/web/index.html From 763b6c33f4d6825d67527d30d8fa286f14476d67 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sun, 8 Jun 2025 15:57:32 +0200 Subject: [PATCH 10/10] output --- render.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/render.py b/render.py index 6c10048..96221e8 100755 --- a/render.py +++ b/render.py @@ -11,9 +11,8 @@ if __name__ == "__main__": root = Path(__file__).resolve().parent root_input = root / "in" root_output = root / "out" - web = root_output / "web" fs.wipe(root_output) - fs.make_directory(web) + fs.make_directory(root_output) run( "rsync", "--archive", @@ -21,5 +20,5 @@ if __name__ == "__main__": "--progress", "--verbose", f"{root_input}{sep}", - f"{web}{sep}", + f"{root_output}{sep}", )