Skip to content

Commit f2a55d8

Browse files
committed
Merge branch 'ubuntu_22_10_dependencies' into main
2 parents fa3ba3f + 9c663fb commit f2a55d8

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

.github/workflows/test-install-dependencies.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
runs-on: ubuntu-latest
1717
strategy:
1818
matrix:
19-
container_image: ["fedora:34", "fedora:35", "fedora:36", "ubuntu:18.04", "ubuntu:20.04", "ubuntu:22.04"]
19+
container_image: ["fedora:34", "fedora:35", "fedora:36", "ubuntu:18.04", "ubuntu:20.04", "ubuntu:22.04", "ubuntu:22.10"]
2020
container:
2121
image: ${{ matrix.container_image }}
2222
steps:

docs/source/_static/install_dependencies.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ readonly ubuntu_pkgs_pre22_04=(
5151
libdc1394-22-dev
5252
)
5353

54-
readonly ubuntu_pkgs_22_04=(
54+
readonly ubuntu_pkgs_post22_04=(
5555
"${ubuntu_pkgs[@]}"
5656
libdc1394-dev
5757
)
@@ -112,8 +112,8 @@ elif [ -f /etc/os-release ]; then
112112
if [[ "$ID" == "ubuntu" || "$ID" == "debian" || "$ID_LIKE" == "ubuntu" || "$ID_LIKE" == "debian" || "$ID_LIKE" == "ubuntu debian" ]]; then
113113
if [[ ! $(uname -m) =~ ^arm* ]]; then
114114
sudo apt-get update
115-
if [[ "$VERSION_ID" == "22.04" ]]; then
116-
sudo apt-get install -y "${ubuntu_pkgs_22_04[@]}"
115+
if [[ "$VERSION_ID" > "22.04" || "$VERSION_ID" == "22.04" ]]; then
116+
sudo apt-get install -y "${ubuntu_pkgs_post22_04[@]}"
117117
else
118118
sudo apt-get install -y "${ubuntu_pkgs_pre22_04[@]}"
119119
fi

0 commit comments

Comments
 (0)