From 1c9f43bfb4b816b18c5b7d35075ef453eae64e3e Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Mon, 22 Jul 2024 15:04:19 +0200 Subject: [PATCH 1/3] docker --- .forgejo/workflows/main.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/main.yaml b/.forgejo/workflows/main.yaml index bd3d2d3..510b3b8 100644 --- a/.forgejo/workflows/main.yaml +++ b/.forgejo/workflows/main.yaml @@ -2,7 +2,7 @@ on: [push] jobs: job: container: - image: debian:bookworm + image: ${{vars.DOCKER||'docker.io'}}/debian:bookworm steps: - name: cd env: From e3afd3bb08f4e652f33991b9d49c534d785396d7 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sun, 13 Oct 2024 23:01:06 +0200 Subject: [PATCH 2/3] web --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 2f8193e..e2b5d8d 100755 --- a/build.sh +++ b/build.sh @@ -4,7 +4,7 @@ ROOT="$(dirname "${FILE}")" INPUT="${ROOT}/in" INPUTS="${ROOT}/in.txt" -OUTPUT="${ROOT}/out" +OUTPUT="${ROOT}/out/web" function main { local file From d833cf85707fdc257ff7e23dad57341844136edd Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sun, 13 Oct 2024 23:05:05 +0200 Subject: [PATCH 3/3] workflow --- .forgejo/workflows/main.yaml | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/.forgejo/workflows/main.yaml b/.forgejo/workflows/main.yaml index 510b3b8..5846ff3 100644 --- a/.forgejo/workflows/main.yaml +++ b/.forgejo/workflows/main.yaml @@ -2,21 +2,16 @@ 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}} - CD_OS_NAME: debian - CD_OS_VERSION: bookworm - run: eval ${{vars.cd}} + SPCD: ${{vars.SPCD}} + SPCD_SSH_HOSTS: ${{vars.SPCD_SSH_HOSTS}} + SPCD_SSH_KEY: ${{secrets.SPCD_SSH_KEY}} + SPCD_TXT_LOCALE: ${{vars.SPCD_TXT_LOCALE}} + run: ${{vars.cd}} - - run: cd-list-environment - - - run: cd-clone-branch - - run: cd-install-packages pandoc - - - run: cd-build-project - - run: cd-browse-workspace - - - run: cd-synchronize out + - run: spcd-build-project + - run: spcd-browse-workspace + - run: spcd-synchronize