From 496fd259e0f7b1a74a0dd02bc41a2b610f1415f4 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sun, 13 Oct 2024 20:42:44 +0200 Subject: [PATCH 1/4] web --- build.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.py b/build.py index 0a29dce..b429941 100755 --- a/build.py +++ b/build.py @@ -6,6 +6,6 @@ from pathlib import Path from rwx.fs import make_directory, write if __name__ == "__main__": - out = Path(__file__).parent / "out" + out = Path(__file__).parent / "out" / "web" make_directory(out) write(out / "index.html", "spcd.rwx.work") From 68c64ef384ff14b057b09ce62052a8d1a0bb5130 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sun, 13 Oct 2024 20:47:09 +0200 Subject: [PATCH 2/4] alpine first in main --- .forgejo/workflows/main.yaml | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/.forgejo/workflows/main.yaml b/.forgejo/workflows/main.yaml index 0a7ebca..38fbae9 100644 --- a/.forgejo/workflows/main.yaml +++ b/.forgejo/workflows/main.yaml @@ -1,23 +1,7 @@ on: [push] jobs: - arch: - container: - image: ${{vars.DOCKER}}archlinux:base-20240818.0.255804 - steps: - - name: spcd - env: - SPCD: ${{vars.SPCD}} - SPCD_TXT_LOCALE: ${{vars.SPCD_TXT_LOCALE}} - run: ${{vars.SPCD}} - - - run: spcd-check-project - - run: spcd-build-project - - run: spcd-browse-workspace - alpine: - needs: arch - if: failure() || success() container: image: ${{vars.DOCKER}}alpine:3.20 steps: @@ -31,9 +15,25 @@ jobs: - run: spcd-build-project - run: spcd-browse-workspace - fedora: + arch: needs: alpine if: failure() || success() + container: + image: ${{vars.DOCKER}}archlinux:base-20240818.0.255804 + steps: + - name: spcd + env: + SPCD: ${{vars.SPCD}} + SPCD_TXT_LOCALE: ${{vars.SPCD_TXT_LOCALE}} + run: ${{vars.SPCD}} + + - run: spcd-check-project + - run: spcd-build-project + - run: spcd-browse-workspace + + fedora: + needs: arch + if: failure() || success() container: image: ${{vars.DOCKER}}fedora:40 steps: From 40fad99700df1550eeeb04bd98670fb1227e046a Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sun, 13 Oct 2024 20:55:59 +0200 Subject: [PATCH 3/4] fedora later in main --- .forgejo/workflows/main.yaml | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/.forgejo/workflows/main.yaml b/.forgejo/workflows/main.yaml index 38fbae9..fd70abb 100644 --- a/.forgejo/workflows/main.yaml +++ b/.forgejo/workflows/main.yaml @@ -31,24 +31,8 @@ jobs: - run: spcd-build-project - run: spcd-browse-workspace - fedora: - needs: arch - if: failure() || success() - container: - image: ${{vars.DOCKER}}fedora:40 - steps: - - name: spcd - env: - SPCD: ${{vars.SPCD}} - SPCD_TXT_LOCALE: ${{vars.SPCD_TXT_LOCALE}} - run: ${{vars.SPCD}} - - - run: spcd-check-project - - run: spcd-build-project - - run: spcd-browse-workspace - debian: - needs: fedora + needs: arch if: failure() || success() container: image: ${{vars.DOCKER}}debian:bookworm @@ -98,9 +82,25 @@ jobs: - run: spcd-build-project - run: spcd-browse-workspace - alma: + fedora: needs: ubuntu if: failure() || success() + container: + image: ${{vars.DOCKER}}fedora:40 + steps: + - name: spcd + env: + SPCD: ${{vars.SPCD}} + SPCD_TXT_LOCALE: ${{vars.SPCD_TXT_LOCALE}} + run: ${{vars.SPCD}} + + - run: spcd-check-project + - run: spcd-build-project + - run: spcd-browse-workspace + + alma: + needs: fedora + if: failure() || success() container: image: ${{vars.DOCKER}}almalinux:9 steps: From 66a848b5e769ea08eeeaa8961e03b98752ffd3c1 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sun, 13 Oct 2024 20:59:05 +0200 Subject: [PATCH 4/4] alpine first in alt --- .forgejo/workflows/alt.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.forgejo/workflows/alt.yaml b/.forgejo/workflows/alt.yaml index 77da31d..0f4c113 100644 --- a/.forgejo/workflows/alt.yaml +++ b/.forgejo/workflows/alt.yaml @@ -1,9 +1,9 @@ on: [push] jobs: - arch: + alpine: container: - image: ${{vars.DOCKER}}archlinux:base-20240101.0.204074 + image: ${{vars.DOCKER}}alpine:3.19 steps: - name: spcd env: @@ -15,11 +15,11 @@ jobs: - run: spcd-build-project - run: spcd-browse-workspace - alpine: - needs: arch + arch: + needs: alpine if: failure() || success() container: - image: ${{vars.DOCKER}}alpine:3.19 + image: ${{vars.DOCKER}}archlinux:base-20240101.0.204074 steps: - name: spcd env: