diff --git a/.forgejo/workflows/alt.yaml b/.forgejo/workflows/alt.yaml index 0f4c113..77da31d 100644 --- a/.forgejo/workflows/alt.yaml +++ b/.forgejo/workflows/alt.yaml @@ -1,9 +1,9 @@ on: [push] jobs: - alpine: + arch: container: - image: ${{vars.DOCKER}}alpine:3.19 + image: ${{vars.DOCKER}}archlinux:base-20240101.0.204074 steps: - name: spcd env: @@ -15,11 +15,11 @@ jobs: - run: spcd-build-project - run: spcd-browse-workspace - arch: - needs: alpine + alpine: + needs: arch if: failure() || success() container: - image: ${{vars.DOCKER}}archlinux:base-20240101.0.204074 + image: ${{vars.DOCKER}}alpine:3.19 steps: - name: spcd env: diff --git a/.forgejo/workflows/main.yaml b/.forgejo/workflows/main.yaml index b09420b..0a7ebca 100644 --- a/.forgejo/workflows/main.yaml +++ b/.forgejo/workflows/main.yaml @@ -1,7 +1,23 @@ 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: @@ -15,9 +31,25 @@ jobs: - run: spcd-build-project - run: spcd-browse-workspace - debian: + fedora: needs: alpine 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 + if: failure() || success() container: image: ${{vars.DOCKER}}debian:bookworm steps: @@ -34,24 +66,8 @@ jobs: - run: spcd-browse-workspace - run: spcd-synchronize - arch: - needs: debian - 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 - opensuse: - needs: arch + needs: debian if: failure() || success() container: image: ${{vars.DOCKER}}opensuse/leap:15.6 @@ -82,24 +98,8 @@ jobs: - run: spcd-build-project - run: spcd-browse-workspace - 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 + needs: ubuntu if: failure() || success() container: image: ${{vars.DOCKER}}almalinux:9 diff --git a/build.py b/build.py index b429941..0a29dce 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" / "web" + out = Path(__file__).parent / "out" make_directory(out) write(out / "index.html", "spcd.rwx.work") diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh index b9b1702..b19907a 100644 --- a/spcd/bootstrap.sh +++ b/spcd/bootstrap.sh @@ -811,9 +811,6 @@ spcd_f_pkg() { "${SPCD_PM_PACMAN}") spcd_f_pm_pkg_install "openssh" ;; *) ;; esac - # pandoc - spcd_step "PanDoc" - spcd_f_pm_pkg_install "pandoc" # plantuml spcd_step "PlantUML" spcd_f_pm_pkg_install "plantuml"