Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/commit-lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion .github/workflows/compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pants-cache.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pants.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
37 changes: 19 additions & 18 deletions compose-files/fit-demo/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down