From: Arran Cudbard-Bell Date: Wed, 28 Aug 2024 16:58:16 +0000 (-0500) Subject: FreeBSD's pip is called pip X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=580a1979efc9e30392dd1911925c90e155b9dc71;p=thirdparty%2Ffreeradius-server.git FreeBSD's pip is called pip --- diff --git a/.github/workflows/ci-freebsd.yml b/.github/workflows/ci-freebsd.yml index 56eacf62a2b..ca2caf700fa 100644 --- a/.github/workflows/ci-freebsd.yml +++ b/.github/workflows/ci-freebsd.yml @@ -86,7 +86,7 @@ jobs: sqlite3 \ talloc \ unixODBC - PIP_BREAK_SYSTEM_PACKAGES=1 pip3 install tacacs_plus + PIP_BREAK_SYSTEM_PACKAGES=1 pip install tacacs_plus echo "#! /bin/sh" | sudo tee /usr/local/bin/nproc echo "sysctl -n hw.ncpu" | sudo tee -a /usr/local/bin/nproc sudo chmod +x /usr/local/bin/nproc diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 52115376ed5..00e21d6ea65 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -68,8 +68,6 @@ jobs: # code - the name/version of the OS (for step evaluations below) # docker - the docker image name, if containers are being used # name - used in the job name only - - # Add this back when the base self-hosted docker image has been updated to 24.04 os: - runs_on: "${{ needs.pre-ci.outputs.selfhosted == '1' && 'self-hosted' || 'ubuntu-20.04' }}" docker: "${{ needs.pre-ci.outputs.selfhosted == '1' && 'docker.internal.networkradius.com/self-hosted' || 'ubuntu:24.04' }}"