Merge branch 'master' into ci/ubuntu-22

Borda · Jan 19, 2023 · 498b592 · 498b592
2 parents 865c0b4 + d6ddf03
commit 498b592
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/code-format.yml b/.github/workflows/code-format.yml
@@ -16,7 +16,7 @@ jobs:
 
       - name: set PY
         run: echo "PY=$(python -VV | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV
-      - uses: actions/cache@v3.0.11
+      - uses: actions/cache@v3.2.2
         with:
           path: ~/.cache/pre-commit
           key: pre-commit|${{ env.PY }}|${{ hashFiles('.pre-commit-config.yaml') }}

diff --git a/.github/workflows/docker-builds.yml b/.github/workflows/docker-builds.yml
@@ -19,7 +19,7 @@ jobs:
       matrix:
         ubuntu_version: ["22.04"]
         python_version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
-        opencv_version: ["4.6.0"]
+        opencv_version: ["4.7.0"]
         device: ["cpu", "gpu"]
         include:
           - {ubuntu_version: "20.04", python_version: "2.7", opencv_version: "4.6.0", device: "cpu"}

diff --git a/cpu/Dockerfile b/cpu/Dockerfile
@@ -8,7 +8,7 @@ FROM ubuntu:${UBUNTU_VERSION}
 LABEL maintainer="https://github.com/Borda"
 
 ARG PYTHON_VERSION=3.9
-ARG OPENCV_VERSION=4.6.0
+ARG OPENCV_VERSION=4.7.0
 
 # Needed for string substitution
 SHELL ["/bin/bash", "-c"]

diff --git a/gpu/Dockerfile b/gpu/Dockerfile
@@ -13,7 +13,7 @@ FROM nvidia/cuda:${CUDA_VERSION}-devel-ubuntu${UBUNTU_VERSION}
 LABEL maintainer="https://github.com/Borda"
 
 ARG PYTHON_VERSION=3.9
-ARG OPENCV_VERSION=4.6.0
+ARG OPENCV_VERSION=4.7.0
 
 # Needed for string substitution
 SHELL ["/bin/bash", "-c"]