diff --git a/.github/workflows/conda/environment_linux.yml b/.github/workflows/conda/environment_linux.yml index 0ee6f44a19..71038ef880 100644 --- a/.github/workflows/conda/environment_linux.yml +++ b/.github/workflows/conda/environment_linux.yml @@ -8,6 +8,7 @@ dependencies: - xorg-libx11 - xorg-libxfixes - mesa-libegl-cos7-x86_64 + - icu - libxml2 - libdc1394 >=2.2.6 - librealsense diff --git a/.github/workflows/other-arch-isolated.yml b/.github/workflows/other-arch-isolated.yml index fae718834e..6a485e2f02 100644 --- a/.github/workflows/other-arch-isolated.yml +++ b/.github/workflows/other-arch-isolated.yml @@ -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/run-on-arch-action@v2.7.2 + 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 diff --git a/.github/workflows/other-arch.yml b/.github/workflows/other-arch.yml index 18ccb7c6a1..27884f1036 100644 --- a/.github/workflows/other-arch.yml +++ b/.github/workflows/other-arch.yml @@ -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/run-on-arch-action@v2.7.2 + 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