diff --git a/.forgejo/workflows/main.yaml b/.forgejo/workflows/main.yaml index bfda7a6..c5e7030 100644 --- a/.forgejo/workflows/main.yaml +++ b/.forgejo/workflows/main.yaml @@ -28,22 +28,8 @@ jobs: - run: spcd-build-project - run: spcd-browse-workspace - opensuse: - needs: archlinux - container: - image: ${{vars.DOCKER}}opensuse/leap:15.6 - steps: - - name: spcd - env: - SPCD: ${{vars.SPCD}} - run: ${{vars.SPCD}} - - - run: spcd-check-project - - run: spcd-build-project - - run: spcd-browse-workspace - fedora: - needs: opensuse + needs: archlinux container: image: ${{vars.DOCKER}}fedora:40 steps: @@ -56,8 +42,22 @@ jobs: - run: spcd-build-project - run: spcd-browse-workspace - ubuntu: + opensuse: needs: fedora + container: + image: ${{vars.DOCKER}}opensuse/leap:15.6 + steps: + - name: spcd + env: + SPCD: ${{vars.SPCD}} + run: ${{vars.SPCD}} + + - run: spcd-check-project + - run: spcd-build-project + - run: spcd-browse-workspace + + ubuntu: + needs: opensuse container: image: ${{vars.DOCKER}}ubuntu:noble steps: diff --git a/.forgejo/workflows/previous.yaml b/.forgejo/workflows/previous.yaml index 060064f..c62ebb7 100644 --- a/.forgejo/workflows/previous.yaml +++ b/.forgejo/workflows/previous.yaml @@ -42,22 +42,8 @@ jobs: - run: spcd-build-project - run: spcd-browse-workspace - fedora: - needs: opensuse - container: - image: ${{vars.DOCKER}}fedora:39 - steps: - - name: spcd - env: - SPCD: ${{vars.SPCD}} - run: ${{vars.SPCD}} - - - run: spcd-check-project - - run: spcd-build-project - - run: spcd-browse-workspace - almalinux: - needs: fedora + needs: opensuse container: image: ${{vars.DOCKER}}almalinux:8 steps: @@ -70,8 +56,22 @@ jobs: - run: spcd-build-project - run: spcd-browse-workspace - rockylinux: + fedora: needs: almalinux + container: + image: ${{vars.DOCKER}}fedora:39 + steps: + - name: spcd + env: + SPCD: ${{vars.SPCD}} + run: ${{vars.SPCD}} + + - run: spcd-check-project + - run: spcd-build-project + - run: spcd-browse-workspace + + rockylinux: + needs: fedora container: image: ${{vars.DOCKER}}rockylinux:8 steps: diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh index 5d56ad3..bbd87a9 100644 --- a/spcd/bootstrap.sh +++ b/spcd/bootstrap.sh @@ -32,9 +32,9 @@ [ -n "${SPCD_URL_PYTHON}" ] || SPCD_URL_PYTHON="https://pypi.org/simple" [ -n "${SPCD_URL_ROCKY}" ] || - SPCD_URL_ROCKY="https://dl.rockylinux.org/\$contentdir" + SPCD_URL_ROCKY="https://dl.rockylinux.org" [ -n "${SPCD_URL_UBUNTU}" ] || - SPCD_URL_UBUNTU="https://ubuntu.mirrors.ovh.net/ubuntu" + SPCD_URL_UBUNTU="https://ubuntu.mirrors.ovh.net" # ╭───────────╮ # │ internals │