From dd4c941033e9cd5d2cef55d9d1d51a6ec385c0ca Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Fri, 30 Aug 2024 02:31:50 +0200 Subject: [PATCH 1/3] workflows --- .forgejo/workflows/main.yaml | 8 ++++++++ .forgejo/workflows/previous.yaml | 8 ++++++++ .gitea/workflows/main.yaml | 6 ++++-- .github/workflows/main.yaml | 6 ++++-- 4 files changed, 24 insertions(+), 4 deletions(-) diff --git a/.forgejo/workflows/main.yaml b/.forgejo/workflows/main.yaml index a689a86..97d4312 100644 --- a/.forgejo/workflows/main.yaml +++ b/.forgejo/workflows/main.yaml @@ -8,6 +8,7 @@ jobs: - name: spcd env: SPCD: ${{vars.SPCD}} + SPCD_TXT_LANGUAGE: ${{vars.SPCD_TXT_LANGUAGE}} run: ${{vars.SPCD}} - run: spcd-check-project @@ -22,6 +23,7 @@ jobs: - name: spcd env: SPCD: ${{vars.SPCD}} + SPCD_TXT_LANGUAGE: ${{vars.SPCD_TXT_LANGUAGE}} run: ${{vars.SPCD}} - run: spcd-check-project @@ -36,6 +38,7 @@ jobs: - name: spcd env: SPCD: ${{vars.SPCD}} + SPCD_TXT_LANGUAGE: ${{vars.SPCD_TXT_LANGUAGE}} run: ${{vars.SPCD}} - run: spcd-check-project @@ -50,6 +53,7 @@ jobs: - name: spcd env: SPCD: ${{vars.SPCD}} + SPCD_TXT_LANGUAGE: ${{vars.SPCD_TXT_LANGUAGE}} run: ${{vars.SPCD}} - run: spcd-check-project @@ -64,6 +68,7 @@ jobs: - name: spcd env: SPCD: ${{vars.SPCD}} + SPCD_TXT_LANGUAGE: ${{vars.SPCD_TXT_LANGUAGE}} run: ${{vars.SPCD}} - run: spcd-check-project @@ -78,6 +83,7 @@ jobs: - name: spcd env: SPCD: ${{vars.SPCD}} + SPCD_TXT_LANGUAGE: ${{vars.SPCD_TXT_LANGUAGE}} run: ${{vars.SPCD}} - run: spcd-check-project @@ -92,6 +98,7 @@ jobs: - name: spcd env: SPCD: ${{vars.SPCD}} + SPCD_TXT_LANGUAGE: ${{vars.SPCD_TXT_LANGUAGE}} run: ${{vars.SPCD}} - run: spcd-check-project @@ -108,6 +115,7 @@ jobs: SPCD: ${{vars.SPCD}} SPCD_SSH_HOSTS: ${{vars.SPCD_SSH_HOSTS}} SPCD_SSH_KEY: ${{secrets.SPCD_SSH_KEY}} + SPCD_TXT_LANGUAGE: ${{vars.SPCD_TXT_LANGUAGE}} run: ${{vars.SPCD}} - run: spcd-check-project diff --git a/.forgejo/workflows/previous.yaml b/.forgejo/workflows/previous.yaml index 1ea7b0c..f322728 100644 --- a/.forgejo/workflows/previous.yaml +++ b/.forgejo/workflows/previous.yaml @@ -8,6 +8,7 @@ jobs: - name: spcd env: SPCD: ${{vars.SPCD}} + SPCD_TXT_LANGUAGE: ${{vars.SPCD_TXT_LANGUAGE}} run: ${{vars.SPCD}} - run: spcd-check-project @@ -22,6 +23,7 @@ jobs: - name: spcd env: SPCD: ${{vars.SPCD}} + SPCD_TXT_LANGUAGE: ${{vars.SPCD_TXT_LANGUAGE}} run: ${{vars.SPCD}} - run: spcd-check-project @@ -36,6 +38,7 @@ jobs: - name: spcd env: SPCD: ${{vars.SPCD}} + SPCD_TXT_LANGUAGE: ${{vars.SPCD_TXT_LANGUAGE}} run: ${{vars.SPCD}} - run: spcd-check-project @@ -50,6 +53,7 @@ jobs: - name: spcd env: SPCD: ${{vars.SPCD}} + SPCD_TXT_LANGUAGE: ${{vars.SPCD_TXT_LANGUAGE}} run: ${{vars.SPCD}} - run: spcd-check-project @@ -64,6 +68,7 @@ jobs: - name: spcd env: SPCD: ${{vars.SPCD}} + SPCD_TXT_LANGUAGE: ${{vars.SPCD_TXT_LANGUAGE}} run: ${{vars.SPCD}} - run: spcd-check-project @@ -78,6 +83,7 @@ jobs: - name: spcd env: SPCD: ${{vars.SPCD}} + SPCD_TXT_LANGUAGE: ${{vars.SPCD_TXT_LANGUAGE}} run: ${{vars.SPCD}} - run: spcd-check-project @@ -92,6 +98,7 @@ jobs: - name: spcd env: SPCD: ${{vars.SPCD}} + SPCD_TXT_LANGUAGE: ${{vars.SPCD_TXT_LANGUAGE}} run: ${{vars.SPCD}} - run: spcd-check-project @@ -106,6 +113,7 @@ jobs: - name: spcd env: SPCD: ${{vars.SPCD}} + SPCD_TXT_LANGUAGE: ${{vars.SPCD_TXT_LANGUAGE}} run: ${{vars.SPCD}} - run: spcd-check-project diff --git a/.gitea/workflows/main.yaml b/.gitea/workflows/main.yaml index 6c538bd..f6cad75 100644 --- a/.gitea/workflows/main.yaml +++ b/.gitea/workflows/main.yaml @@ -1,5 +1,6 @@ on: [push] jobs: + job: container: image: ${{vars.DOCKER}}debian:bookworm @@ -7,8 +8,9 @@ jobs: - name: spcd env: SPCD: ${{vars.SPCD}} - SPCD_GIT_MAIN: ${{vars.SPCD_GIT_MAIN}} - SPCD_GIT_ROOT: ${{vars.SPCD_GIT_ROOT}} + SPCD_GIT_RWX: ${{vars.SPCD_GIT_RWX}} + SPCD_GIT_SPCD: ${{vars.SPCD_GIT_SPCD}} + SPCD_TXT_LANGUAGE: ${{vars.SPCD_TXT_LANGUAGE}} run: ${{vars.SPCD}} - run: spcd-check-project diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index cc5bd20..5f92d0f 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -1,5 +1,6 @@ on: [push] jobs: + job: runs-on: ubuntu-latest container: @@ -8,8 +9,9 @@ jobs: - name: spcd env: SPCD: ${{vars.SPCD}} - SPCD_GIT_MAIN: ${{vars.SPCD_GIT_MAIN}} - SPCD_GIT_ROOT: ${{vars.SPCD_GIT_ROOT}} + SPCD_GIT_RWX: ${{vars.SPCD_GIT_RWX}} + SPCD_GIT_SPCD: ${{vars.SPCD_GIT_SPCD}} + SPCD_TXT_LANGUAGE: ${{vars.SPCD_TXT_LANGUAGE}} run: echo '${{vars.SPCD}}' | tr -d "\r" | sh -s - run: spcd-check-project From b2bf0fc84aff8237925d3d34b186c057e67a5f5b Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Fri, 30 Aug 2024 03:22:28 +0200 Subject: [PATCH 2/3] previous/debian --- .forgejo/workflows/previous.yaml | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/.forgejo/workflows/previous.yaml b/.forgejo/workflows/previous.yaml index f322728..0a63f0c 100644 --- a/.forgejo/workflows/previous.yaml +++ b/.forgejo/workflows/previous.yaml @@ -45,8 +45,23 @@ jobs: - run: spcd-build-project - run: spcd-browse-workspace - ubuntu: + debian: needs: opensuse + container: + image: ${{vars.DOCKER}}debian:bullseye + steps: + - name: spcd + env: + SPCD: ${{vars.SPCD}} + SPCD_TXT_LANGUAGE: ${{vars.SPCD_TXT_LANGUAGE}} + run: ${{vars.SPCD}} + + - run: spcd-check-project + - run: spcd-build-project + - run: spcd-browse-workspace + + ubuntu: + needs: debian container: image: ${{vars.DOCKER}}ubuntu:jammy steps: @@ -104,18 +119,3 @@ jobs: - run: spcd-check-project - run: spcd-build-project - run: spcd-browse-workspace - - debian: - needs: rockylinux - container: - image: ${{vars.DOCKER}}debian:bullseye - steps: - - name: spcd - env: - SPCD: ${{vars.SPCD}} - SPCD_TXT_LANGUAGE: ${{vars.SPCD_TXT_LANGUAGE}} - run: ${{vars.SPCD}} - - - run: spcd-check-project - - run: spcd-build-project - - run: spcd-browse-workspace From 5dc2f37b7953421f67b742d0624a4f6d6e793b6f Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Fri, 30 Aug 2024 03:25:21 +0200 Subject: [PATCH 3/3] previous/cancelled --- .forgejo/workflows/previous.yaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.forgejo/workflows/previous.yaml b/.forgejo/workflows/previous.yaml index 0a63f0c..29f69a2 100644 --- a/.forgejo/workflows/previous.yaml +++ b/.forgejo/workflows/previous.yaml @@ -17,6 +17,7 @@ jobs: archlinux: needs: alpine + if: !cancelled() container: image: ${{vars.DOCKER}}archlinux:base-20240101.0.204074 steps: @@ -32,6 +33,7 @@ jobs: opensuse: needs: archlinux + if: !cancelled() container: image: ${{vars.DOCKER}}opensuse/leap:15.5 steps: @@ -47,6 +49,7 @@ jobs: debian: needs: opensuse + if: !cancelled() container: image: ${{vars.DOCKER}}debian:bullseye steps: @@ -62,6 +65,7 @@ jobs: ubuntu: needs: debian + if: !cancelled() container: image: ${{vars.DOCKER}}ubuntu:jammy steps: @@ -77,6 +81,7 @@ jobs: almalinux: needs: ubuntu + if: !cancelled() container: image: ${{vars.DOCKER}}almalinux:8 steps: @@ -92,6 +97,7 @@ jobs: fedora: needs: almalinux + if: !cancelled() container: image: ${{vars.DOCKER}}fedora:39 steps: @@ -107,6 +113,7 @@ jobs: rockylinux: needs: fedora + if: !cancelled() container: image: ${{vars.DOCKER}}rockylinux:8 steps: