diff --git a/.github/workflows/test-install-dependencies.yml b/.github/workflows/test-install-dependencies.yml index e894209ab..7300ddb8b 100644 --- a/.github/workflows/test-install-dependencies.yml +++ b/.github/workflows/test-install-dependencies.yml @@ -16,7 +16,7 @@ runs-on: ubuntu-latest strategy: matrix: - container_image: ["fedora:34", "fedora:35", "fedora:36", "ubuntu:18.04", "ubuntu:20.04", "ubuntu:22.04"] + container_image: ["fedora:34", "fedora:35", "fedora:36", "ubuntu:18.04", "ubuntu:20.04", "ubuntu:22.04", "ubuntu:rolling"] container: image: ${{ matrix.container_image }} steps: @@ -32,7 +32,17 @@ ln -snf /usr/share/zoneinfo/UTC /etc/localtime && echo UTC > /etc/timezone # Otherwise tzdata installer prompts for user input sed '/udevadm control --reload-rules && sudo udevadm trigger/d' docs/source/_static/install_dependencies.sh > tmp_script.sh # Doesn't work on docker bash tmp_script.sh + - name: Create a virtual environment + if: endsWith(matrix.container_image, 'rolling') == true + run: | + sudo apt-get install -y python3-venv + python3 -m venv venv + . venv/bin/activate + pip install --upgrade pip + python3 examples/install_requirements.py + shell: bash - name: Install example requirements + if: endsWith(matrix.container_image, 'rolling') == false run: | python3 examples/install_requirements.py test_macos: diff --git a/docs/source/_static/install_dependencies.sh b/docs/source/_static/install_dependencies.sh index 3b04f3507..7298def5f 100755 --- a/docs/source/_static/install_dependencies.sh +++ b/docs/source/_static/install_dependencies.sh @@ -188,10 +188,10 @@ elif [ -f /etc/os-release ]; then if [ $IS_ARM ]; then sudo DEBIAN_FRONTEND=noninteractive apt install -y "${debian_arm_pkgs[@]}" - if [ "$version" == "13" ]; then + if [[ $version == 13* ]]; then echo "Detected ARM Debian 13" sudo apt install -y "${debian_pkgs_23[@]}" - elif version_lte "$version" "11"; then + elif version_lte "$version" "11.99"; then echo "Using pre-22.04 ARM package list" sudo apt-get install -y ${debian_pkgs_pre22_04[@]} @@ -214,10 +214,10 @@ elif [ -f /etc/os-release ]; then else sudo DEBIAN_FRONTEND=noninteractive apt install -y "${debian_pkgs[@]}" - if [ $version == "13" ]; then + if [[ $version == 13* ]]; then echo "Detected Debian 13" sudo apt install -y "${debian_pkgs_23[@]}" - elif version_lte "$version" "11"; then + elif version_lte "$version" "11.99"; then echo "Using pre-22.04 package list" sudo apt-get install -y "${debian_pkgs_pre22_04[@]}"