-
Notifications
You must be signed in to change notification settings - Fork 286
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into update_tuto_brightness_cycle_gamma_methods
- Loading branch information
Showing
44 changed files
with
226 additions
and
78 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -28,23 +28,23 @@ jobs: | |
| # - arch: armv6 | ||
| # distro: bullseye | ||
| # target: ARMV6 | ||
| - arch: armv7 | ||
| distro: ubuntu_latest | ||
| target: ARMV7 | ||
| endianness: (Little Endian) | ||
| #- arch: armv7 | ||
| # distro: ubuntu:latest | ||
| # target: ARMV7 | ||
| # endianness: (Little Endian) | ||
| - arch: aarch64 | ||
| distro: ubuntu_latest | ||
| distro: ubuntu:latest | ||
| endianness: (Little Endian) | ||
| - arch: riscv64 | ||
| distro: ubuntu_latest | ||
| distro: ubuntu:latest | ||
| target: RISC-V | ||
| endianness: (Little Endian) | ||
| - arch: ppc64le | ||
| distro: ubuntu_latest | ||
| distro: ubuntu:latest | ||
| target: POWER8 | ||
| endianness: (Little Endian) | ||
| - arch: s390x | ||
| distro: ubuntu_latest | ||
| distro: ubuntu:latest | ||
| target: Z13 | ||
| endianness: (Big Endian) | ||
|
|
||
|
|
@@ -53,11 +53,15 @@ jobs: | |
| uses: actions/checkout@v4 | ||
|
|
||
| - name: Run on arch | ||
| uses: uraimo/[email protected] | ||
| uses: uraimo/run-on-arch-action@v2 | ||
| # See issue https://github.com/uraimo/run-on-arch-action/issues/155 for the explanation on the weird use of the arch and distro | ||
| # that resulted in error | ||
| # ERROR: failed to solve: ${arch}/ubuntu:latest: failed to resolve source metadata for docker.io/${arch}/ubuntu:latest: no match for platform in manifest: not found | ||
| with: | ||
| githubToken: ${{ github.token }} | ||
| arch: ${{ matrix.arch }} | ||
| distro: ${{ matrix.distro }} | ||
| arch: none | ||
| distro: none | ||
| base_image: "--platform=linux/${{ matrix.arch }} ${{ matrix.distro }}" | ||
|
|
||
| run: | | ||
| lscpu | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -32,14 +32,14 @@ jobs: | |
| # distro: ubuntu20.04 | ||
| # target: ARMV7 | ||
| - arch: aarch64 | ||
| distro: ubuntu_latest | ||
| distro: ubuntu:latest | ||
| target: ARMV8 | ||
| endianness: (Little Endian) | ||
| # - arch: ppc64le | ||
| # distro: ubuntu20.04 | ||
| # target: POWER8 | ||
| - arch: s390x | ||
| distro: ubuntu_latest | ||
| distro: ubuntu:latest | ||
| target: Z13 | ||
| endianness: (Big Endian) | ||
|
|
||
|
|
@@ -48,11 +48,15 @@ jobs: | |
| uses: actions/checkout@v4 | ||
|
|
||
| - name: Run on arch | ||
| uses: uraimo/[email protected] | ||
| uses: uraimo/run-on-arch-action@v2 | ||
| # See issue https://github.com/uraimo/run-on-arch-action/issues/155 for the explanation on the weird use of the arch and distro | ||
| # that resulted in error | ||
| # ERROR: failed to solve: ${arch}/ubuntu:latest: failed to resolve source metadata for docker.io/${arch}/ubuntu:latest: no match for platform in manifest: not found | ||
| with: | ||
| githubToken: ${{ github.token }} | ||
| arch: ${{ matrix.arch }} | ||
| distro: ${{ matrix.distro }} | ||
| arch: none | ||
| distro: none | ||
| base_image: "--platform=linux/${{ matrix.arch }} ${{ matrix.distro }}" | ||
|
|
||
| run: | | ||
| lscpu | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,73 @@ | ||
| # Docker dedicated to check compatibility with 3rd party last releases | ||
|
|
||
| ## Build docker image from Dockerfile | ||
|
|
||
| - We suppose here that you already installed docker. | ||
| If this is not the case, follow instructions provided for [Ubuntu](https://visp-doc.inria.fr/doxygen/visp-daily/tutorial-install-docker.html#install_docker_engine_ubuntu) or [MacOS](https://visp-doc.inria.fr/doxygen/visp-daily/tutorial-install-docker.html#install_docker_engine_mac). | ||
|
|
||
| - Get ViSP source code | ||
| ``` | ||
| $ cd $VISP_WS/ | ||
| $ git clone https://github.com/lagadic/visp | ||
| ``` | ||
|
|
||
| - Build docker image from Dockerfile running the following: | ||
| ``` | ||
| $ cd $VISP_WS/visp/ci/docker/ubuntu-dep-src | ||
| $ docker build -t vispci/vispci:ubuntu-dep-src . | ||
| ``` | ||
| The version of ViSP that is considered is by default the master branch from github official repo in | ||
| https://github.com/lagadic/visp | ||
|
|
||
| There is also the possibility to build visp from a specific repo and branch using `GIT_URL` and `GIT_BRANCH_NAME` | ||
| args, like | ||
| ``` | ||
| $ cd $VISP_WS/visp/ci/docker/ubuntu-dep-src | ||
| $ docker build -t vispci/vispci:ubuntu-dep-src --build-arg GIT_URL=https://github.com/lagadic/visp --build-arg GIT_BRANCH_NAME=master . | ||
| ``` | ||
|
|
||
| ## Start the container | ||
|
|
||
| ### On Ubuntu host | ||
|
|
||
| - On your computer running Ubuntu, allow access to the X11 server | ||
| ``` | ||
| $ xhost +local:docker | ||
| non-network local connections being added to access control list | ||
| ``` | ||
| - Run your Docker container. The following command connects to the ubuntu-dep-src Docker container. | ||
| ``` | ||
| $ docker run --rm -it --network=host --privileged \ | ||
| --env=DISPLAY \ | ||
| --env=QT_X11_NO_MITSHM=1 \ | ||
| --volume=/tmp/.X11-unix:/tmp/.X11-unix:rw \ | ||
| --volume=/dev:/dev \ | ||
| vispci/vispci:ubuntu-dep-src | ||
| vispci@6c8d67579659:~$ pwd | ||
| /home/vispci | ||
| ``` | ||
|
|
||
| ### On MacOS host | ||
|
|
||
| - Get your MacOS computer IP address | ||
| ``` | ||
| $ IP=$(/usr/sbin/ipconfig getifaddr en0) | ||
| $ echo $IP | ||
| $ 192.168.1.18 | ||
| ``` | ||
| - Allow connections from MacOS to XQuartz | ||
| ``` | ||
| $ xhost + "$IP" | ||
| 192.168.1.18 being added to access control list | ||
| ``` | ||
| - Run your Docker container. The following command connects to the ubuntu-dep-src Docker container. | ||
| ``` | ||
| $ docker run --rm -it --network=host --privileged \ | ||
| --env=DISPLAY="${IP}:0" \ | ||
| --env=QT_X11_NO_MITSHM=1 \ | ||
| --volume=/tmp/.X11-unix:/tmp/.X11-unix:rw \ | ||
| --volume=/dev:/dev \ | ||
| vispci/vispci:ubuntu-dep-src | ||
| vispci@6c8d67579659:~$ pwd | ||
| /home/vispci | ||
| ``` |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.