From 7fc8199f5d2184a4b0744e8c12275a99e205f6ca Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Mon, 26 Aug 2024 23:15:44 +0200 Subject: [PATCH 1/2] ubuntu,rocky --- spcd/bootstrap.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh index bbd87a9..5d56ad3 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" + SPCD_URL_ROCKY="https://dl.rockylinux.org/\$contentdir" [ -n "${SPCD_URL_UBUNTU}" ] || - SPCD_URL_UBUNTU="https://ubuntu.mirrors.ovh.net" + SPCD_URL_UBUNTU="https://ubuntu.mirrors.ovh.net/ubuntu" # ╭───────────╮ # │ internals │ From 99f2c8d32d99d4da5f6d64d3403694ad72312d53 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Mon, 26 Aug 2024 23:20:31 +0200 Subject: [PATCH 2/2] workflows --- .forgejo/workflows/main.yaml | 32 ++++++++++++++++---------------- .forgejo/workflows/previous.yaml | 32 ++++++++++++++++---------------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/.forgejo/workflows/main.yaml b/.forgejo/workflows/main.yaml index c5e7030..bfda7a6 100644 --- a/.forgejo/workflows/main.yaml +++ b/.forgejo/workflows/main.yaml @@ -28,22 +28,8 @@ jobs: - run: spcd-build-project - run: spcd-browse-workspace - fedora: - needs: archlinux - container: - image: ${{vars.DOCKER}}fedora:40 - steps: - - name: spcd - env: - SPCD: ${{vars.SPCD}} - run: ${{vars.SPCD}} - - - run: spcd-check-project - - run: spcd-build-project - - run: spcd-browse-workspace - opensuse: - needs: fedora + needs: archlinux container: image: ${{vars.DOCKER}}opensuse/leap:15.6 steps: @@ -56,8 +42,22 @@ jobs: - run: spcd-build-project - run: spcd-browse-workspace - ubuntu: + fedora: needs: opensuse + container: + image: ${{vars.DOCKER}}fedora:40 + steps: + - name: spcd + env: + SPCD: ${{vars.SPCD}} + run: ${{vars.SPCD}} + + - run: spcd-check-project + - run: spcd-build-project + - run: spcd-browse-workspace + + ubuntu: + needs: fedora container: image: ${{vars.DOCKER}}ubuntu:noble steps: diff --git a/.forgejo/workflows/previous.yaml b/.forgejo/workflows/previous.yaml index c62ebb7..060064f 100644 --- a/.forgejo/workflows/previous.yaml +++ b/.forgejo/workflows/previous.yaml @@ -42,22 +42,8 @@ jobs: - run: spcd-build-project - run: spcd-browse-workspace - almalinux: - needs: opensuse - container: - image: ${{vars.DOCKER}}almalinux:8 - steps: - - name: spcd - env: - SPCD: ${{vars.SPCD}} - run: ${{vars.SPCD}} - - - run: spcd-check-project - - run: spcd-build-project - - run: spcd-browse-workspace - fedora: - needs: almalinux + needs: opensuse container: image: ${{vars.DOCKER}}fedora:39 steps: @@ -70,8 +56,22 @@ jobs: - run: spcd-build-project - run: spcd-browse-workspace - rockylinux: + almalinux: needs: fedora + container: + image: ${{vars.DOCKER}}almalinux:8 + steps: + - name: spcd + env: + SPCD: ${{vars.SPCD}} + run: ${{vars.SPCD}} + + - run: spcd-check-project + - run: spcd-build-project + - run: spcd-browse-workspace + + rockylinux: + needs: almalinux container: image: ${{vars.DOCKER}}rockylinux:8 steps: