From 0e0cd8dcc9ebdf737412e0a69bea42a867c18dda Mon Sep 17 00:00:00 2001 From: ZdenekM Date: Thu, 20 Jul 2023 14:23:33 +0200 Subject: [PATCH 1/2] chore(fit-demo): compose updated for current version of services --- compose-files/fit-demo/docker-compose.yml | 37 ++++++++++++----------- 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/compose-files/fit-demo/docker-compose.yml b/compose-files/fit-demo/docker-compose.yml index 6e14188d7..b2385ed0c 100644 --- a/compose-files/fit-demo/docker-compose.yml +++ b/compose-files/fit-demo/docker-compose.yml @@ -2,7 +2,7 @@ version: '3.8' services: fit-demo-arserver: - image: arcor2/arcor2_arserver:1.0.2 + image: arcor2/arcor2_arserver:1.1.0 container_name: fit-demo-arserver depends_on: fit-demo-project: @@ -58,7 +58,7 @@ services: - fit-demo-project-network fit-demo-execution: - image: arcor2/arcor2_execution:1.0.1 + image: arcor2/arcor2_execution:1.1.0 container_name: fit-demo-execution networks: - fit-demo-execution-network @@ -72,7 +72,7 @@ services: - fit-demo-execution:/root/project fit-demo-kinect: - image: arcor2/arcor2_kinect_azure:0.7.1 + image: arcor2/arcor2_kinect_azure:0.7.0 container_name: fit-demo-kinect networks: - fit-demo-kinect-network @@ -124,20 +124,21 @@ services: - ARCOR2_DOBOT_MOCK=true - ARCOR2_SCENE_SERVICE_URL=http://fit-demo-scene:5013 - ARCOR2_DOBOT_MODEL=m1 - - fit-demo-3d-mouse: - image: arcor2/arcor2_3d_mouse:1.0.0 - container_name: fit-demo-3d-mouse - privileged: true - volumes: - - type: tmpfs - target: /myapp/tmpdir - - /usr/share/alsa:/usr/share/alsa - - /run/user/${UID}/pulse/native:/run/user/${UID}/pulse/native - - /etc/alsa:/etc/alsa - environment: - - G_UID=${UID} - - PULSE_SERVER=unix:/run/user/${UID}/pulse/native + +# TODO commented out until it is officially released +# fit-demo-3d-mouse: +# image: arcor2/arcor2_3d_mouse:1.0.0 +# container_name: fit-demo-3d-mouse +# privileged: true +# volumes: +# - type: tmpfs +# target: /myapp/tmpdir +# - /usr/share/alsa:/usr/share/alsa +# - /run/user/${UID}/pulse/native:/run/user/${UID}/pulse/native +# - /etc/alsa:/etc/alsa +# environment: +# - G_UID=${UID} +# - PULSE_SERVER=unix:/run/user/${UID}/pulse/native fit-demo-scene: @@ -189,7 +190,7 @@ services: - fit-demo-asset fit-demo-upload-object-types: - image: arcor2/arcor2_upload_fit_demo:1.2.1 + image: arcor2/arcor2_upload_fit_demo:1.2.0 container_name: "fit-demo-upload-object-types" depends_on: fit-demo-project: From 86a5672932b36ce7f28c6987b36b9e99a09279f1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 5 Sep 2023 10:12:08 +0000 Subject: [PATCH 2/2] build(deps): bump actions/checkout from 3 to 4 Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/commit-lint.yaml | 2 +- .github/workflows/compose.yaml | 2 +- .github/workflows/pants-cache.yaml | 2 +- .github/workflows/pants.yaml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 07268586b..77ee42e38 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -38,7 +38,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL diff --git a/.github/workflows/commit-lint.yaml b/.github/workflows/commit-lint.yaml index db6bc6ee8..4bd14c2ae 100644 --- a/.github/workflows/commit-lint.yaml +++ b/.github/workflows/commit-lint.yaml @@ -5,7 +5,7 @@ jobs: commitlint: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 - uses: wagoid/commitlint-github-action@v5 \ No newline at end of file diff --git a/.github/workflows/compose.yaml b/.github/workflows/compose.yaml index 75fb379ff..22f07fb51 100644 --- a/.github/workflows/compose.yaml +++ b/.github/workflows/compose.yaml @@ -9,7 +9,7 @@ jobs: compose: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Check syntax of fit-demo run: | docker-compose -f compose-files/fit-demo/docker-compose.yml -f compose-files/fit-demo/docker-compose.lab.yml config diff --git a/.github/workflows/pants-cache.yaml b/.github/workflows/pants-cache.yaml index af0f07dd6..58d62fd74 100644 --- a/.github/workflows/pants-cache.yaml +++ b/.github/workflows/pants-cache.yaml @@ -17,7 +17,7 @@ jobs: matrix: python-version: ['3.10'] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 lfs: true diff --git a/.github/workflows/pants.yaml b/.github/workflows/pants.yaml index a29137735..46e23cf50 100644 --- a/.github/workflows/pants.yaml +++ b/.github/workflows/pants.yaml @@ -48,7 +48,7 @@ jobs: echo echo "=== After pruning ===" df -h - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 lfs: true